Move tests into test/unit

This makes room for a sibling directory for nodepool functional tests. Change-Id: Iace94d313edb04192ac23a533ed967f076410980
2017-01-24 10:18:38 -08:00 · 2017-01-24 10:18:38 -08:00 · 2a8e0fa5f1
commit 2a8e0fa5f1
parent ac8df45bc5
20 changed files with 3 additions and 2 deletions
--- a/.testr.conf
+++ b/.testr.conf
@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=OS_LOG_LEVEL=${OS_LOG_LEVEL:-INFO} OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} OS_LOG_DEFAULTS=${OS_LOG_DEFAULTS:-""} ${PYTHON:-python} -m subunit.run discover -t ./ tests $LISTOPT $IDOPTION
+test_command=OS_LOG_LEVEL=${OS_LOG_LEVEL:-INFO} OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} OS_LOG_DEFAULTS=${OS_LOG_DEFAULTS:-""} ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./tests/unit} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
--- a/tests/unit/init.py
+++ b/tests/unit/init.py
--- a/tests/unit/test_change_matcher.py
+++ b/tests/unit/test_change_matcher.py
--- a/tests/unit/test_clonemapper.py
+++ b/tests/unit/test_clonemapper.py
--- a/tests/unit/test_cloner.py
+++ b/tests/unit/test_cloner.py
--- a/tests/unit/test_cloner_cmd.py
+++ b/tests/unit/test_cloner_cmd.py
--- a/tests/unit/test_connection.py
+++ b/tests/unit/test_connection.py
--- a/tests/unit/test_daemon.py
+++ b/tests/unit/test_daemon.py
--- a/tests/unit/test_gerrit.py
+++ b/tests/unit/test_gerrit.py
@ -20,10 +20,11 @@ try:
 except ImportError:
    import mock

+import tests.base
 from tests.base import BaseTestCase
 from zuul.driver.gerrit.gerritconnection import GerritConnection

-FIXTURE_DIR = os.path.join(os.path.dirname(__file__), 'fixtures/gerrit')
+FIXTURE_DIR = os.path.join(tests.base.FIXTURE_DIR, 'gerrit')


 def read_fixture(file):
--- a/tests/unit/test_layoutvalidator.py
+++ b/tests/unit/test_layoutvalidator.py
--- a/tests/unit/test_merger_repo.py
+++ b/tests/unit/test_merger_repo.py
--- a/tests/unit/test_model.py
+++ b/tests/unit/test_model.py
--- a/tests/unit/test_nodepool.py
+++ b/tests/unit/test_nodepool.py
--- a/tests/unit/test_openstack.py
+++ b/tests/unit/test_openstack.py
--- a/tests/unit/test_requirements.py
+++ b/tests/unit/test_requirements.py
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
--- a/tests/unit/test_stack_dump.py
+++ b/tests/unit/test_stack_dump.py
--- a/tests/unit/test_v3.py
+++ b/tests/unit/test_v3.py
--- a/tests/unit/test_webapp.py
+++ b/tests/unit/test_webapp.py
--- a/tests/unit/test_zuultrigger.py
+++ b/tests/unit/test_zuultrigger.py