Fix running the unittests under py3

Since we added the tests.functional the py3 tests wasn't running
properly fixing it with some voodoo testr magic.

Change-Id: Id301adb32ba739f05591c4c352e0cf7d87576755

3 files changed, 5 insertions, 3 deletions

diff --git a/.functests b/.functests
index 05d9002..16c9e5d 100755
--- a/.functests
+++ b/.functests
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -e
 
-python setup.py testr --coverage --testr-args="--concurrency=1 tests.functional"
+export OS_TEST_PATH='tests.functional'
+python setup.py testr --coverage --testr-args="--concurrency=1"
+
 RET=$?
 coverage report -m
 rm -f .coverage
diff --git a/.testr.conf b/.testr.conf
index 081907d..f3fca90 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
+test_command=${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./tests/unit} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/tox.ini b/tox.ini
index f88505c..5cee4cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
 
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --testr-args="{posargs} tests.unit"
+commands = python setup.py testr --testr-args="{posargs}"
 
 [testenv:pypy]
 deps = setuptools<3.2