From 20106572ed15f62435ecf3ab5e9d1141f712149e Mon Sep 17 00:00:00 2001
From: Major Hayden <major@mhtx.net>
Date: Thu, 3 Dec 2015 08:58:37 -0600
Subject: [PATCH] Merging check/functional jobs into one

Change-Id: I33620151414d647b904db41acf849086004d5234
---
 run_tests.sh |  5 -----
 tox.ini      | 12 ++++--------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index cf7c10a5..feaf4759 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -16,7 +16,6 @@
 set -euov
 
 FUNCTIONAL_TEST=${FUNCTIONAL_TEST:-false}
-CHECK_MODE_TEST=${CHECK_MODE_TEST:-true}
 
 # prep the host
 if [ "$(which apt-get)" ]; then
@@ -38,10 +37,6 @@ for tox_env in $(awk -F= '/envlist/ {print $2}' tox.ini | sed 's/,/ /g'); do
     if ${FUNCTIONAL_TEST}; then
       tox -e ${tox_env}
     fi
-  elif [ "${tox_env}" == "ansible-check" ]; then
-    if ${CHECK_MODE_TEST}; then
-      tox -e ${tox_env}
-    fi
   else
     tox -e ${tox_env}
   fi
diff --git a/tox.ini b/tox.ini
index a87f5719..9f2f8ced 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = docs,pep8,bashate,ansible-syntax,ansible-lint,ansible-functional,ansible-check
+envlist = docs,pep8,bashate,ansible-syntax,ansible-lint,ansible-functional
 
 [testenv]
 usedevelop = True
@@ -73,15 +73,11 @@ commands = ansible-lint test.yml
 
 [testenv:ansible-functional]
 changedir = tests
-commands =
-    ansible-playbook -i inventory \
-                     -e "rolename={toxinidir}" \
-                     test.yml
-
-[testenv:ansible-check]
-changedir = tests
 commands =
     ansible-playbook -i inventory \
                      --check \
                      -e "rolename={toxinidir}" \
                      test.yml
+    ansible-playbook -i inventory \
+                     -e "rolename={toxinidir}" \
+                     test.yml