From 56263a5feaeaa2e34112d298ecfd4fd7b5a91db1 Mon Sep 17 00:00:00 2001
From: Matthew Jones <mat@matburt.net>
Date: Mon, 1 Oct 2018 11:19:48 -0400
Subject: [PATCH] Force ui cleanup in the test environment

Also allow using the system make
---
 Makefile                            | 2 +-
 tools/docker-compose/start_tests.sh | 2 +-
 tox.ini                             | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 59c34e2127..e3d98840b9 100644
--- a/Makefile
+++ b/Makefile
@@ -565,7 +565,7 @@ docker-compose-test: docker-auth
 	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /bin/bash
 
 docker-compose-runtest:
-	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /start_tests.sh
+	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /start_tests.sh && docker-compose rm -sf
 
 docker-compose-build: awx-devel-build
 
diff --git a/tools/docker-compose/start_tests.sh b/tools/docker-compose/start_tests.sh
index b95c999b76..fd757a9e13 100755
--- a/tools/docker-compose/start_tests.sh
+++ b/tools/docker-compose/start_tests.sh
@@ -1,5 +1,5 @@
 set +x
-
+make clean
 cp -R /tmp/awx.egg-info /awx_devel/ || true
 sed -i "s/placeholder/$(cat /awx_devel/VERSION)/" /awx_devel/awx.egg-info/PKG-INFO
 cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link
diff --git a/tox.ini b/tox.ini
index 583b4afb88..c996dc3c03 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,9 @@ envlist =
     api,
     ui,
 
-; [testenv]
-; basepython = python2.7
+[testenv]
+;basepython = python2.7
+whitelist_externals = make
 ; setenv =
 ;     DJANGO_SETTINGS_MODULE = awx.settings.development_quiet
 ;     SWIG_FEATURES = -cpperraswarn -includeall -I/usr/include/openssl
@@ -29,6 +30,7 @@ commands =
 deps =
     nodeenv
 commands =
+    make clean-ui
     make ui-devel
     npm run --prefix awx/ui jshint
     npm run --prefix awx/ui lint
@@ -56,5 +58,6 @@ commands =
 deps =
     nodeenv
 commands =
+    make clean-ui
     make ui-devel
     make ui-test-ci