From f1af76f228740f8e796fe6c3a99179421cc96524 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 2 Feb 2017 15:20:24 +1100
Subject: [PATCH] Don't run unit tests from run_functests.sh

Change ec7f56c1b2d8aa385751f02a3fa82e5a13d20b9d add added unit tests
in diskimage_builder/tests/functional (this is probably misnamed).

These are found and run by testr just as part of the normal "setup.py
test" run.  Don't run them as part of the functional tests (this
breaks "-h"/"-l" because it installs a virtualenv and runs tests, and
also is incorrect in the gate where it's creating a nested virtualenv
underneath the testing virtualenv).

Change-Id: I9908e080042d3026a198ba89eb653c6eff376d22
---
 tests/run_functests.sh | 5 -----
 tox.ini                | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/tests/run_functests.sh b/tests/run_functests.sh
index a07a0811..5df026d7 100755
--- a/tests/run_functests.sh
+++ b/tests/run_functests.sh
@@ -5,11 +5,6 @@ set -o pipefail
 
 BASE_DIR=$(cd $(dirname "$0")/.. && pwd)
 
-# first we will run python functional tests with tox
-pushd $BASE_DIR
-tox -epython-functests
-popd
-
 # then execute tests for elements
 export DIB_CMD=disk-image-create
 export DIB_ELEMENTS=$(python -c '
diff --git a/tox.ini b/tox.ini
index c9ad4159..df0f8617 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,9 +24,6 @@ commands = {posargs}
 envdir = {toxworkdir}/venv
 commands = {toxinidir}/tests/run_functests.sh {posargs}
 
-[testenv:python-functests]
-setenv = OS_TEST_PATH=./diskimage_builder/tests/functional
-
 [testenv:cover]
 setenv = PYTHON=coverage run --source diskimage_builder
 commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'