diff options
author | James E. Blair <jeblair@redhat.com> | 2017-01-24 10:18:38 -0800 |
---|---|---|
committer | James E. Blair <jeblair@redhat.com> | 2017-01-24 10:18:38 -0800 |
commit | 2a8e0fa5f1b4621205e6794657fcd15b551ac10d (patch) | |
tree | 0e59b19c26ee427a2ef1560c130dd5e10df13193 | |
parent | ac8df45bc5ce5fc618825d3427d8c06e61af64bd (diff) | |
download | zuul-2a8e0fa5f1b4621205e6794657fcd15b551ac10d.tar.gz |
Move tests into test/unit
This makes room for a sibling directory for nodepool functional tests.
Change-Id: Iace94d313edb04192ac23a533ed967f076410980
-rw-r--r-- | .testr.conf | 2 | ||||
-rw-r--r-- | tests/unit/__init__.py | 0 | ||||
-rw-r--r-- | tests/unit/test_change_matcher.py (renamed from tests/test_change_matcher.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_clonemapper.py (renamed from tests/test_clonemapper.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_cloner.py (renamed from tests/test_cloner.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_cloner_cmd.py (renamed from tests/test_cloner_cmd.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_connection.py (renamed from tests/test_connection.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_daemon.py (renamed from tests/test_daemon.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_gerrit.py (renamed from tests/test_gerrit.py) | 3 | ||||
-rw-r--r-- | tests/unit/test_layoutvalidator.py (renamed from tests/test_layoutvalidator.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_merger_repo.py (renamed from tests/test_merger_repo.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_model.py (renamed from tests/test_model.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_nodepool.py (renamed from tests/test_nodepool.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_openstack.py (renamed from tests/test_openstack.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_requirements.py (renamed from tests/test_requirements.py) | 0 | ||||
-rwxr-xr-x | tests/unit/test_scheduler.py (renamed from tests/test_scheduler.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_stack_dump.py (renamed from tests/test_stack_dump.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_v3.py (renamed from tests/test_v3.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_webapp.py (renamed from tests/test_webapp.py) | 0 | ||||
-rw-r--r-- | tests/unit/test_zuultrigger.py (renamed from tests/test_zuultrigger.py) | 0 |
20 files changed, 3 insertions, 2 deletions
diff --git a/.testr.conf b/.testr.conf index 8ef668907..e8f41cd80 100644 --- 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 diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/unit/__init__.py diff --git a/tests/test_change_matcher.py b/tests/unit/test_change_matcher.py index 05853223a..05853223a 100644 --- a/tests/test_change_matcher.py +++ b/tests/unit/test_change_matcher.py diff --git a/tests/test_clonemapper.py b/tests/unit/test_clonemapper.py index b7814f82e..b7814f82e 100644 --- a/tests/test_clonemapper.py +++ b/tests/unit/test_clonemapper.py diff --git a/tests/test_cloner.py b/tests/unit/test_cloner.py index 67b5303a3..67b5303a3 100644 --- a/tests/test_cloner.py +++ b/tests/unit/test_cloner.py diff --git a/tests/test_cloner_cmd.py b/tests/unit/test_cloner_cmd.py index 9cbb5b83f..9cbb5b83f 100644 --- a/tests/test_cloner_cmd.py +++ b/tests/unit/test_cloner_cmd.py diff --git a/tests/test_connection.py b/tests/unit/test_connection.py index f8d1bf533..f8d1bf533 100644 --- a/tests/test_connection.py +++ b/tests/unit/test_connection.py diff --git a/tests/test_daemon.py b/tests/unit/test_daemon.py index 689d4f709..689d4f709 100644 --- a/tests/test_daemon.py +++ b/tests/unit/test_daemon.py diff --git a/tests/test_gerrit.py b/tests/unit/test_gerrit.py index bfbaedc03..999e55d53 100644 --- a/tests/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): diff --git a/tests/test_layoutvalidator.py b/tests/unit/test_layoutvalidator.py index 38c8e29a6..38c8e29a6 100644 --- a/tests/test_layoutvalidator.py +++ b/tests/unit/test_layoutvalidator.py diff --git a/tests/test_merger_repo.py b/tests/unit/test_merger_repo.py index 5062c1440..5062c1440 100644 --- a/tests/test_merger_repo.py +++ b/tests/unit/test_merger_repo.py diff --git a/tests/test_model.py b/tests/unit/test_model.py index 018934065..018934065 100644 --- a/tests/test_model.py +++ b/tests/unit/test_model.py diff --git a/tests/test_nodepool.py b/tests/unit/test_nodepool.py index 6462f9af9..6462f9af9 100644 --- a/tests/test_nodepool.py +++ b/tests/unit/test_nodepool.py diff --git a/tests/test_openstack.py b/tests/unit/test_openstack.py index 175b4bd32..175b4bd32 100644 --- a/tests/test_openstack.py +++ b/tests/unit/test_openstack.py diff --git a/tests/test_requirements.py b/tests/unit/test_requirements.py index 1ea0b2eb3..1ea0b2eb3 100644 --- a/tests/test_requirements.py +++ b/tests/unit/test_requirements.py diff --git a/tests/test_scheduler.py b/tests/unit/test_scheduler.py index 821629c61..821629c61 100755 --- a/tests/test_scheduler.py +++ b/tests/unit/test_scheduler.py diff --git a/tests/test_stack_dump.py b/tests/unit/test_stack_dump.py index 824e04c53..824e04c53 100644 --- a/tests/test_stack_dump.py +++ b/tests/unit/test_stack_dump.py diff --git a/tests/test_v3.py b/tests/unit/test_v3.py index 885330268..885330268 100644 --- a/tests/test_v3.py +++ b/tests/unit/test_v3.py diff --git a/tests/test_webapp.py b/tests/unit/test_webapp.py index 2211d1be4..2211d1be4 100644 --- a/tests/test_webapp.py +++ b/tests/unit/test_webapp.py diff --git a/tests/test_zuultrigger.py b/tests/unit/test_zuultrigger.py index b36e5a4fe..b36e5a4fe 100644 --- a/tests/test_zuultrigger.py +++ b/tests/unit/test_zuultrigger.py |