diff --git a/.travis.yml b/.travis.yml index e070c8894..1a9b6de13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ install: script: - pylint --rcfile pylintrc testplan - - pytest test --verbose + - pytest tests --verbose diff --git a/doc/en/getting_started.rst b/doc/en/getting_started.rst index e32813766..0f10d3a2b 100644 --- a/doc/en/getting_started.rst +++ b/doc/en/getting_started.rst @@ -415,13 +415,13 @@ tests. Some tests may be skipped due to optional dependency packages .. code-block:: text - cd test + cd tests # Unit tests. - py.test unit --verbose + pytest unit --verbose # Functional tests. - py.test functional --verbose + pytest functional --verbose Writing custom drivers diff --git a/test/__init__.py b/tests/__init__.py similarity index 100% rename from test/__init__.py rename to tests/__init__.py diff --git a/test/functional/__init__.py b/tests/functional/__init__.py similarity index 100% rename from test/functional/__init__.py rename to tests/functional/__init__.py diff --git a/test/functional/examples/test_examples.py b/tests/functional/examples/test_examples.py similarity index 84% rename from test/functional/examples/test_examples.py rename to tests/functional/examples/test_examples.py index ff523dd43..b8ff00142 100755 --- a/test/functional/examples/test_examples.py +++ b/tests/functional/examples/test_examples.py @@ -9,7 +9,13 @@ import platform -FILE_DIR = os.path.dirname(__file__) +_FILE_DIR = os.path.dirname(__file__) + +# This file is under tests/functional/examples, so the root directory is 3 +# levels up. +_REPO_ROOT = os.path.abspath(os.path.join( + _FILE_DIR, *(os.pardir for _ in range(3)))) +_EXAMPLES_ROOT = os.path.join(_REPO_ROOT, 'examples') ON_WINDOWS = platform.system() == 'Windows' @@ -52,33 +58,12 @@ def _param_formatter(param): return repr(param) -def _examples_root(): - """ - Find the examples directory that sits next to test & testplan - """ - - cwd = FILE_DIR - while True: - contents = os.listdir(cwd) - if all([entry in contents for entry in ROOT_DIR_CONTENTS]): - break - parent_dir = os.path.dirname(cwd) - if os.path.realpath(cwd) == os.path.realpath(parent_dir): - raise RuntimeError('Could not find repo directory') - cwd = parent_dir - - return os.path.abspath(os.path.join( - cwd, - 'examples' - )) - - @pytest.mark.parametrize( 'root,filename', [ (os.path.abspath(root), filename) for root, _, files in os.walk( - _examples_root(), followlinks=True) + _EXAMPLES_ROOT, followlinks=True) for filename in files if ('test_plan' in filename and filename.endswith('.py')) ], diff --git a/test/functional/exporters/__init__.py b/tests/functional/exporters/__init__.py similarity index 100% rename from test/functional/exporters/__init__.py rename to tests/functional/exporters/__init__.py diff --git a/test/functional/exporters/testing/__init__.py b/tests/functional/exporters/testing/__init__.py similarity index 100% rename from test/functional/exporters/testing/__init__.py rename to tests/functional/exporters/testing/__init__.py diff --git a/test/functional/exporters/testing/dummy_cli_arg_test_plan.py b/tests/functional/exporters/testing/dummy_cli_arg_test_plan.py similarity index 100% rename from test/functional/exporters/testing/dummy_cli_arg_test_plan.py rename to tests/functional/exporters/testing/dummy_cli_arg_test_plan.py diff --git a/test/functional/exporters/testing/dummy_programmatic_test_plan.py b/tests/functional/exporters/testing/dummy_programmatic_test_plan.py similarity index 100% rename from test/functional/exporters/testing/dummy_programmatic_test_plan.py rename to tests/functional/exporters/testing/dummy_programmatic_test_plan.py diff --git a/test/functional/exporters/testing/test_json.py b/tests/functional/exporters/testing/test_json.py similarity index 100% rename from test/functional/exporters/testing/test_json.py rename to tests/functional/exporters/testing/test_json.py diff --git a/test/functional/exporters/testing/test_pdf.py b/tests/functional/exporters/testing/test_pdf.py similarity index 100% rename from test/functional/exporters/testing/test_pdf.py rename to tests/functional/exporters/testing/test_pdf.py diff --git a/test/functional/exporters/testing/test_webserver.py b/tests/functional/exporters/testing/test_webserver.py similarity index 100% rename from test/functional/exporters/testing/test_webserver.py rename to tests/functional/exporters/testing/test_webserver.py diff --git a/test/functional/exporters/testing/test_xml.py b/tests/functional/exporters/testing/test_xml.py similarity index 100% rename from test/functional/exporters/testing/test_xml.py rename to tests/functional/exporters/testing/test_xml.py diff --git a/test/functional/testplan/__init__.py b/tests/functional/testplan/__init__.py similarity index 100% rename from test/functional/testplan/__init__.py rename to tests/functional/testplan/__init__.py diff --git a/test/functional/testplan/func_basic_tasks.py b/tests/functional/testplan/func_basic_tasks.py similarity index 100% rename from test/functional/testplan/func_basic_tasks.py rename to tests/functional/testplan/func_basic_tasks.py diff --git a/test/functional/testplan/report/__init__.py b/tests/functional/testplan/report/__init__.py similarity index 100% rename from test/functional/testplan/report/__init__.py rename to tests/functional/testplan/report/__init__.py diff --git a/test/functional/testplan/report/testing/__init__.py b/tests/functional/testplan/report/testing/__init__.py similarity index 100% rename from test/functional/testplan/report/testing/__init__.py rename to tests/functional/testplan/report/testing/__init__.py diff --git a/test/functional/testplan/report/testing/test_merge.py b/tests/functional/testplan/report/testing/test_merge.py similarity index 100% rename from test/functional/testplan/report/testing/test_merge.py rename to tests/functional/testplan/report/testing/test_merge.py diff --git a/test/functional/testplan/runnable/__init__.py b/tests/functional/testplan/runnable/__init__.py similarity index 100% rename from test/functional/testplan/runnable/__init__.py rename to tests/functional/testplan/runnable/__init__.py diff --git a/test/functional/testplan/runnable/interactive/__init__.py b/tests/functional/testplan/runnable/interactive/__init__.py similarity index 100% rename from test/functional/testplan/runnable/interactive/__init__.py rename to tests/functional/testplan/runnable/interactive/__init__.py diff --git a/test/functional/testplan/runnable/interactive/basic_suite_template.txt b/tests/functional/testplan/runnable/interactive/basic_suite_template.txt similarity index 100% rename from test/functional/testplan/runnable/interactive/basic_suite_template.txt rename to tests/functional/testplan/runnable/interactive/basic_suite_template.txt diff --git a/test/functional/testplan/runnable/interactive/interactive_executable.py b/tests/functional/testplan/runnable/interactive/interactive_executable.py similarity index 100% rename from test/functional/testplan/runnable/interactive/interactive_executable.py rename to tests/functional/testplan/runnable/interactive/interactive_executable.py diff --git a/test/functional/testplan/runnable/interactive/reports/__init__.py b/tests/functional/testplan/runnable/interactive/reports/__init__.py similarity index 100% rename from test/functional/testplan/runnable/interactive/reports/__init__.py rename to tests/functional/testplan/runnable/interactive/reports/__init__.py diff --git a/test/functional/testplan/runnable/interactive/reports/basic_run_case_test1.py b/tests/functional/testplan/runnable/interactive/reports/basic_run_case_test1.py similarity index 100% rename from test/functional/testplan/runnable/interactive/reports/basic_run_case_test1.py rename to tests/functional/testplan/runnable/interactive/reports/basic_run_case_test1.py diff --git a/test/functional/testplan/runnable/interactive/reports/basic_run_suite_test2.py b/tests/functional/testplan/runnable/interactive/reports/basic_run_suite_test2.py similarity index 100% rename from test/functional/testplan/runnable/interactive/reports/basic_run_suite_test2.py rename to tests/functional/testplan/runnable/interactive/reports/basic_run_suite_test2.py diff --git a/test/functional/testplan/runnable/interactive/reports/basic_top_level.py b/tests/functional/testplan/runnable/interactive/reports/basic_top_level.py similarity index 100% rename from test/functional/testplan/runnable/interactive/reports/basic_top_level.py rename to tests/functional/testplan/runnable/interactive/reports/basic_top_level.py diff --git a/test/functional/testplan/runnable/interactive/reports/basic_top_level_reset.py b/tests/functional/testplan/runnable/interactive/reports/basic_top_level_reset.py similarity index 100% rename from test/functional/testplan/runnable/interactive/reports/basic_top_level_reset.py rename to tests/functional/testplan/runnable/interactive/reports/basic_top_level_reset.py diff --git a/test/functional/testplan/runnable/interactive/test_interactive.py b/tests/functional/testplan/runnable/interactive/test_interactive.py similarity index 100% rename from test/functional/testplan/runnable/interactive/test_interactive.py rename to tests/functional/testplan/runnable/interactive/test_interactive.py diff --git a/test/functional/testplan/runners/__init__.py b/tests/functional/testplan/runners/__init__.py similarity index 100% rename from test/functional/testplan/runners/__init__.py rename to tests/functional/testplan/runners/__init__.py diff --git a/test/functional/testplan/runners/fixtures/__init__.py b/tests/functional/testplan/runners/fixtures/__init__.py similarity index 100% rename from test/functional/testplan/runners/fixtures/__init__.py rename to tests/functional/testplan/runners/fixtures/__init__.py diff --git a/test/functional/testplan/runners/fixtures/assertions_failing/__init__.py b/tests/functional/testplan/runners/fixtures/assertions_failing/__init__.py similarity index 100% rename from test/functional/testplan/runners/fixtures/assertions_failing/__init__.py rename to tests/functional/testplan/runners/fixtures/assertions_failing/__init__.py diff --git a/test/functional/testplan/runners/fixtures/assertions_failing/report.py b/tests/functional/testplan/runners/fixtures/assertions_failing/report.py similarity index 100% rename from test/functional/testplan/runners/fixtures/assertions_failing/report.py rename to tests/functional/testplan/runners/fixtures/assertions_failing/report.py diff --git a/test/functional/testplan/runners/fixtures/assertions_failing/suites.py b/tests/functional/testplan/runners/fixtures/assertions_failing/suites.py similarity index 100% rename from test/functional/testplan/runners/fixtures/assertions_failing/suites.py rename to tests/functional/testplan/runners/fixtures/assertions_failing/suites.py diff --git a/test/functional/testplan/runners/fixtures/assertions_passing/__init__.py b/tests/functional/testplan/runners/fixtures/assertions_passing/__init__.py similarity index 100% rename from test/functional/testplan/runners/fixtures/assertions_passing/__init__.py rename to tests/functional/testplan/runners/fixtures/assertions_passing/__init__.py diff --git a/test/functional/testplan/runners/fixtures/assertions_passing/report.py b/tests/functional/testplan/runners/fixtures/assertions_passing/report.py similarity index 100% rename from test/functional/testplan/runners/fixtures/assertions_passing/report.py rename to tests/functional/testplan/runners/fixtures/assertions_passing/report.py diff --git a/test/functional/testplan/runners/fixtures/assertions_passing/suites.py b/tests/functional/testplan/runners/fixtures/assertions_passing/suites.py similarity index 100% rename from test/functional/testplan/runners/fixtures/assertions_passing/suites.py rename to tests/functional/testplan/runners/fixtures/assertions_passing/suites.py diff --git a/test/functional/testplan/runners/fixtures/matplotlib/__init__.py b/tests/functional/testplan/runners/fixtures/matplotlib/__init__.py similarity index 100% rename from test/functional/testplan/runners/fixtures/matplotlib/__init__.py rename to tests/functional/testplan/runners/fixtures/matplotlib/__init__.py diff --git a/test/functional/testplan/runners/fixtures/matplotlib/report.py b/tests/functional/testplan/runners/fixtures/matplotlib/report.py similarity index 100% rename from test/functional/testplan/runners/fixtures/matplotlib/report.py rename to tests/functional/testplan/runners/fixtures/matplotlib/report.py diff --git a/test/functional/testplan/runners/fixtures/matplotlib/suites.py b/tests/functional/testplan/runners/fixtures/matplotlib/suites.py similarity index 100% rename from test/functional/testplan/runners/fixtures/matplotlib/suites.py rename to tests/functional/testplan/runners/fixtures/matplotlib/suites.py diff --git a/test/functional/testplan/runners/pools/__init__.py b/tests/functional/testplan/runners/pools/__init__.py similarity index 100% rename from test/functional/testplan/runners/pools/__init__.py rename to tests/functional/testplan/runners/pools/__init__.py diff --git a/test/functional/testplan/runners/pools/func_pool_base_tasks.py b/tests/functional/testplan/runners/pools/func_pool_base_tasks.py similarity index 100% rename from test/functional/testplan/runners/pools/func_pool_base_tasks.py rename to tests/functional/testplan/runners/pools/func_pool_base_tasks.py diff --git a/test/functional/testplan/runners/pools/test_pool_base.py b/tests/functional/testplan/runners/pools/test_pool_base.py similarity index 100% rename from test/functional/testplan/runners/pools/test_pool_base.py rename to tests/functional/testplan/runners/pools/test_pool_base.py diff --git a/test/functional/testplan/runners/pools/test_pool_process.py b/tests/functional/testplan/runners/pools/test_pool_process.py similarity index 100% rename from test/functional/testplan/runners/pools/test_pool_process.py rename to tests/functional/testplan/runners/pools/test_pool_process.py diff --git a/test/functional/testplan/runners/pools/test_pool_remote.py b/tests/functional/testplan/runners/pools/test_pool_remote.py similarity index 100% rename from test/functional/testplan/runners/pools/test_pool_remote.py rename to tests/functional/testplan/runners/pools/test_pool_remote.py diff --git a/test/functional/testplan/runners/pools/test_runner_e2e.py b/tests/functional/testplan/runners/pools/test_runner_e2e.py similarity index 100% rename from test/functional/testplan/runners/pools/test_runner_e2e.py rename to tests/functional/testplan/runners/pools/test_runner_e2e.py diff --git a/test/functional/testplan/test_timeout.py b/tests/functional/testplan/test_timeout.py similarity index 99% rename from test/functional/testplan/test_timeout.py rename to tests/functional/testplan/test_timeout.py index 8f0577db5..3bf11678b 100755 --- a/test/functional/testplan/test_timeout.py +++ b/tests/functional/testplan/test_timeout.py @@ -10,7 +10,7 @@ from testplan.common.utils.testing import log_propagation_disabled from testplan.common.utils.logger import TESTPLAN_LOGGER -from test.functional.testplan import func_basic_tasks +from tests.functional.testplan import func_basic_tasks class MyTestRunner(TestRunner): diff --git a/test/functional/testplan/testing/__init__.py b/tests/functional/testplan/testing/__init__.py similarity index 100% rename from test/functional/testplan/testing/__init__.py rename to tests/functional/testplan/testing/__init__.py diff --git a/test/functional/testplan/testing/cpp/__init__.py b/tests/functional/testplan/testing/cpp/__init__.py similarity index 100% rename from test/functional/testplan/testing/cpp/__init__.py rename to tests/functional/testplan/testing/cpp/__init__.py diff --git a/test/functional/testplan/testing/cpp/test_gtest.py b/tests/functional/testplan/testing/cpp/test_gtest.py similarity index 96% rename from test/functional/testplan/testing/cpp/test_gtest.py rename to tests/functional/testplan/testing/cpp/test_gtest.py index 76d82db0d..f48631fdc 100755 --- a/test/functional/testplan/testing/cpp/test_gtest.py +++ b/tests/functional/testplan/testing/cpp/test_gtest.py @@ -8,7 +8,7 @@ from testplan.common.utils.logger import TESTPLAN_LOGGER from testplan.testing.cpp import GTest -from test.functional.testplan.testing.fixtures.cpp import gtest +from tests.functional.testplan.testing.fixtures.cpp import gtest fixture_root = os.path.join( os.path.dirname(os.path.dirname(__file__)), diff --git a/test/functional/testplan/testing/cpp/test_hobbestest.py b/tests/functional/testplan/testing/cpp/test_hobbestest.py similarity index 97% rename from test/functional/testplan/testing/cpp/test_hobbestest.py rename to tests/functional/testplan/testing/cpp/test_hobbestest.py index 81a9c158b..fe38b127a 100755 --- a/test/functional/testplan/testing/cpp/test_hobbestest.py +++ b/tests/functional/testplan/testing/cpp/test_hobbestest.py @@ -8,7 +8,7 @@ from testplan.common.utils.logger import TESTPLAN_LOGGER from testplan.testing.cpp import HobbesTest -from test.functional.testplan.testing.fixtures.cpp import hobbestest +from tests.functional.testplan.testing.fixtures.cpp import hobbestest fixture_root = os.path.join( os.path.dirname(os.path.dirname(__file__)), diff --git a/test/functional/testplan/testing/fixtures/__init__.py b/tests/functional/testplan/testing/fixtures/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/__init__.py rename to tests/functional/testplan/testing/fixtures/__init__.py diff --git a/test/functional/testplan/testing/fixtures/base/__init__.py b/tests/functional/testplan/testing/fixtures/base/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/base/__init__.py rename to tests/functional/testplan/testing/fixtures/base/__init__.py diff --git a/test/functional/testplan/testing/fixtures/base/failing/__init__.py b/tests/functional/testplan/testing/fixtures/base/failing/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/base/failing/__init__.py rename to tests/functional/testplan/testing/fixtures/base/failing/__init__.py diff --git a/test/functional/testplan/testing/fixtures/base/failing/report.py b/tests/functional/testplan/testing/fixtures/base/failing/report.py similarity index 100% rename from test/functional/testplan/testing/fixtures/base/failing/report.py rename to tests/functional/testplan/testing/fixtures/base/failing/report.py diff --git a/test/functional/testplan/testing/fixtures/base/failing/test.sh b/tests/functional/testplan/testing/fixtures/base/failing/test.sh similarity index 100% rename from test/functional/testplan/testing/fixtures/base/failing/test.sh rename to tests/functional/testplan/testing/fixtures/base/failing/test.sh diff --git a/test/functional/testplan/testing/fixtures/base/passing/__init__.py b/tests/functional/testplan/testing/fixtures/base/passing/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/base/passing/__init__.py rename to tests/functional/testplan/testing/fixtures/base/passing/__init__.py diff --git a/test/functional/testplan/testing/fixtures/base/passing/report.py b/tests/functional/testplan/testing/fixtures/base/passing/report.py similarity index 100% rename from test/functional/testplan/testing/fixtures/base/passing/report.py rename to tests/functional/testplan/testing/fixtures/base/passing/report.py diff --git a/test/functional/testplan/testing/fixtures/base/passing/test.sh b/tests/functional/testplan/testing/fixtures/base/passing/test.sh similarity index 100% rename from test/functional/testplan/testing/fixtures/base/passing/test.sh rename to tests/functional/testplan/testing/fixtures/base/passing/test.sh diff --git a/test/functional/testplan/testing/fixtures/base/passing/test_env.sh b/tests/functional/testplan/testing/fixtures/base/passing/test_env.sh similarity index 100% rename from test/functional/testplan/testing/fixtures/base/passing/test_env.sh rename to tests/functional/testplan/testing/fixtures/base/passing/test_env.sh diff --git a/test/functional/testplan/testing/fixtures/base/sleeping/__init__.py b/tests/functional/testplan/testing/fixtures/base/sleeping/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/base/sleeping/__init__.py rename to tests/functional/testplan/testing/fixtures/base/sleeping/__init__.py diff --git a/test/functional/testplan/testing/fixtures/base/sleeping/report.py b/tests/functional/testplan/testing/fixtures/base/sleeping/report.py similarity index 100% rename from test/functional/testplan/testing/fixtures/base/sleeping/report.py rename to tests/functional/testplan/testing/fixtures/base/sleeping/report.py diff --git a/test/functional/testplan/testing/fixtures/base/sleeping/test.sh b/tests/functional/testplan/testing/fixtures/base/sleeping/test.sh similarity index 100% rename from test/functional/testplan/testing/fixtures/base/sleeping/test.sh rename to tests/functional/testplan/testing/fixtures/base/sleeping/test.sh diff --git a/test/functional/testplan/testing/fixtures/cpp/__init__.py b/tests/functional/testplan/testing/fixtures/cpp/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/__init__.py rename to tests/functional/testplan/testing/fixtures/cpp/__init__.py diff --git a/test/functional/testplan/testing/fixtures/cpp/gtest/__init__.py b/tests/functional/testplan/testing/fixtures/cpp/gtest/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/gtest/__init__.py rename to tests/functional/testplan/testing/fixtures/cpp/gtest/__init__.py diff --git a/test/functional/testplan/testing/fixtures/cpp/gtest/failing/CMakeLists.txt b/tests/functional/testplan/testing/fixtures/cpp/gtest/failing/CMakeLists.txt similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/gtest/failing/CMakeLists.txt rename to tests/functional/testplan/testing/fixtures/cpp/gtest/failing/CMakeLists.txt diff --git a/test/functional/testplan/testing/fixtures/cpp/gtest/failing/__init__.py b/tests/functional/testplan/testing/fixtures/cpp/gtest/failing/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/gtest/failing/__init__.py rename to tests/functional/testplan/testing/fixtures/cpp/gtest/failing/__init__.py diff --git a/test/functional/testplan/testing/fixtures/cpp/gtest/failing/app.cpp b/tests/functional/testplan/testing/fixtures/cpp/gtest/failing/app.cpp similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/gtest/failing/app.cpp rename to tests/functional/testplan/testing/fixtures/cpp/gtest/failing/app.cpp diff --git a/test/functional/testplan/testing/fixtures/cpp/gtest/failing/report.py b/tests/functional/testplan/testing/fixtures/cpp/gtest/failing/report.py similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/gtest/failing/report.py rename to tests/functional/testplan/testing/fixtures/cpp/gtest/failing/report.py diff --git a/test/functional/testplan/testing/fixtures/cpp/gtest/failing/tests.cpp b/tests/functional/testplan/testing/fixtures/cpp/gtest/failing/tests.cpp similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/gtest/failing/tests.cpp rename to tests/functional/testplan/testing/fixtures/cpp/gtest/failing/tests.cpp diff --git a/test/functional/testplan/testing/fixtures/cpp/gtest/passing/CMakeLists.txt b/tests/functional/testplan/testing/fixtures/cpp/gtest/passing/CMakeLists.txt similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/gtest/passing/CMakeLists.txt rename to tests/functional/testplan/testing/fixtures/cpp/gtest/passing/CMakeLists.txt diff --git a/test/functional/testplan/testing/fixtures/cpp/gtest/passing/__init__.py b/tests/functional/testplan/testing/fixtures/cpp/gtest/passing/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/gtest/passing/__init__.py rename to tests/functional/testplan/testing/fixtures/cpp/gtest/passing/__init__.py diff --git a/test/functional/testplan/testing/fixtures/cpp/gtest/passing/app.cpp b/tests/functional/testplan/testing/fixtures/cpp/gtest/passing/app.cpp similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/gtest/passing/app.cpp rename to tests/functional/testplan/testing/fixtures/cpp/gtest/passing/app.cpp diff --git a/test/functional/testplan/testing/fixtures/cpp/gtest/passing/report.py b/tests/functional/testplan/testing/fixtures/cpp/gtest/passing/report.py similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/gtest/passing/report.py rename to tests/functional/testplan/testing/fixtures/cpp/gtest/passing/report.py diff --git a/test/functional/testplan/testing/fixtures/cpp/gtest/passing/tests.cpp b/tests/functional/testplan/testing/fixtures/cpp/gtest/passing/tests.cpp similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/gtest/passing/tests.cpp rename to tests/functional/testplan/testing/fixtures/cpp/gtest/passing/tests.cpp diff --git a/test/functional/testplan/testing/fixtures/cpp/hobbestest/__init__.py b/tests/functional/testplan/testing/fixtures/cpp/hobbestest/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/hobbestest/__init__.py rename to tests/functional/testplan/testing/fixtures/cpp/hobbestest/__init__.py diff --git a/test/functional/testplan/testing/fixtures/cpp/hobbestest/failing/__init__.py b/tests/functional/testplan/testing/fixtures/cpp/hobbestest/failing/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/hobbestest/failing/__init__.py rename to tests/functional/testplan/testing/fixtures/cpp/hobbestest/failing/__init__.py diff --git a/test/functional/testplan/testing/fixtures/cpp/hobbestest/failing/hobbes-test b/tests/functional/testplan/testing/fixtures/cpp/hobbestest/failing/hobbes-test similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/hobbestest/failing/hobbes-test rename to tests/functional/testplan/testing/fixtures/cpp/hobbestest/failing/hobbes-test diff --git a/test/functional/testplan/testing/fixtures/cpp/hobbestest/failing/input.json b/tests/functional/testplan/testing/fixtures/cpp/hobbestest/failing/input.json similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/hobbestest/failing/input.json rename to tests/functional/testplan/testing/fixtures/cpp/hobbestest/failing/input.json diff --git a/test/functional/testplan/testing/fixtures/cpp/hobbestest/failing/report.py b/tests/functional/testplan/testing/fixtures/cpp/hobbestest/failing/report.py similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/hobbestest/failing/report.py rename to tests/functional/testplan/testing/fixtures/cpp/hobbestest/failing/report.py diff --git a/test/functional/testplan/testing/fixtures/cpp/hobbestest/passing/__init__.py b/tests/functional/testplan/testing/fixtures/cpp/hobbestest/passing/__init__.py similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/hobbestest/passing/__init__.py rename to tests/functional/testplan/testing/fixtures/cpp/hobbestest/passing/__init__.py diff --git a/test/functional/testplan/testing/fixtures/cpp/hobbestest/passing/hobbes-test b/tests/functional/testplan/testing/fixtures/cpp/hobbestest/passing/hobbes-test similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/hobbestest/passing/hobbes-test rename to tests/functional/testplan/testing/fixtures/cpp/hobbestest/passing/hobbes-test diff --git a/test/functional/testplan/testing/fixtures/cpp/hobbestest/passing/input.json b/tests/functional/testplan/testing/fixtures/cpp/hobbestest/passing/input.json similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/hobbestest/passing/input.json rename to tests/functional/testplan/testing/fixtures/cpp/hobbestest/passing/input.json diff --git a/test/functional/testplan/testing/fixtures/cpp/hobbestest/passing/report.py b/tests/functional/testplan/testing/fixtures/cpp/hobbestest/passing/report.py similarity index 100% rename from test/functional/testplan/testing/fixtures/cpp/hobbestest/passing/report.py rename to tests/functional/testplan/testing/fixtures/cpp/hobbestest/passing/report.py diff --git a/test/functional/testplan/testing/multitest/__init__.py b/tests/functional/testplan/testing/multitest/__init__.py similarity index 100% rename from test/functional/testplan/testing/multitest/__init__.py rename to tests/functional/testplan/testing/multitest/__init__.py diff --git a/test/functional/testplan/testing/multitest/test_execution_groups.py b/tests/functional/testplan/testing/multitest/test_execution_groups.py similarity index 100% rename from test/functional/testplan/testing/multitest/test_execution_groups.py rename to tests/functional/testplan/testing/multitest/test_execution_groups.py diff --git a/test/functional/testplan/testing/multitest/test_multitest_drivers.py b/tests/functional/testplan/testing/multitest/test_multitest_drivers.py similarity index 100% rename from test/functional/testplan/testing/multitest/test_multitest_drivers.py rename to tests/functional/testplan/testing/multitest/test_multitest_drivers.py diff --git a/test/functional/testplan/testing/multitest/test_multitest_parts.py b/tests/functional/testplan/testing/multitest/test_multitest_parts.py similarity index 100% rename from test/functional/testplan/testing/multitest/test_multitest_parts.py rename to tests/functional/testplan/testing/multitest/test_multitest_parts.py diff --git a/test/functional/testplan/testing/multitest/test_parametrization.py b/tests/functional/testplan/testing/multitest/test_parametrization.py similarity index 100% rename from test/functional/testplan/testing/multitest/test_parametrization.py rename to tests/functional/testplan/testing/multitest/test_parametrization.py diff --git a/test/functional/testplan/testing/multitest/test_pre_post_steps.py b/tests/functional/testplan/testing/multitest/test_pre_post_steps.py similarity index 100% rename from test/functional/testplan/testing/multitest/test_pre_post_steps.py rename to tests/functional/testplan/testing/multitest/test_pre_post_steps.py diff --git a/test/functional/testplan/testing/multitest/test_stop_on_error.py b/tests/functional/testplan/testing/multitest/test_stop_on_error.py similarity index 100% rename from test/functional/testplan/testing/multitest/test_stop_on_error.py rename to tests/functional/testplan/testing/multitest/test_stop_on_error.py diff --git a/test/functional/testplan/testing/multitest/test_suite_decorators.py b/tests/functional/testplan/testing/multitest/test_suite_decorators.py similarity index 100% rename from test/functional/testplan/testing/multitest/test_suite_decorators.py rename to tests/functional/testplan/testing/multitest/test_suite_decorators.py diff --git a/test/functional/testplan/testing/multitest/test_timeout_on_testcases.py b/tests/functional/testplan/testing/multitest/test_timeout_on_testcases.py similarity index 100% rename from test/functional/testplan/testing/multitest/test_timeout_on_testcases.py rename to tests/functional/testplan/testing/multitest/test_timeout_on_testcases.py diff --git a/test/functional/testplan/testing/test_base.py b/tests/functional/testplan/testing/test_base.py similarity index 100% rename from test/functional/testplan/testing/test_base.py rename to tests/functional/testplan/testing/test_base.py diff --git a/test/functional/testplan/testing/test_filtering.py b/tests/functional/testplan/testing/test_filtering.py similarity index 100% rename from test/functional/testplan/testing/test_filtering.py rename to tests/functional/testplan/testing/test_filtering.py diff --git a/test/functional/testplan/testing/test_listing.py b/tests/functional/testplan/testing/test_listing.py similarity index 100% rename from test/functional/testplan/testing/test_listing.py rename to tests/functional/testplan/testing/test_listing.py diff --git a/test/functional/testplan/testing/test_ordering.py b/tests/functional/testplan/testing/test_ordering.py similarity index 100% rename from test/functional/testplan/testing/test_ordering.py rename to tests/functional/testplan/testing/test_ordering.py diff --git a/test/functional/testplan/testing/test_tagging.py b/tests/functional/testplan/testing/test_tagging.py similarity index 100% rename from test/functional/testplan/testing/test_tagging.py rename to tests/functional/testplan/testing/test_tagging.py diff --git a/test/unit/__init__.py b/tests/unit/__init__.py similarity index 100% rename from test/unit/__init__.py rename to tests/unit/__init__.py diff --git a/test/unit/test_unit.py b/tests/unit/test_unit.py similarity index 100% rename from test/unit/test_unit.py rename to tests/unit/test_unit.py diff --git a/test/unit/testplan/__init__.py b/tests/unit/testplan/__init__.py similarity index 100% rename from test/unit/testplan/__init__.py rename to tests/unit/testplan/__init__.py diff --git a/test/unit/testplan/common/__init__.py b/tests/unit/testplan/common/__init__.py similarity index 100% rename from test/unit/testplan/common/__init__.py rename to tests/unit/testplan/common/__init__.py diff --git a/test/unit/testplan/common/config/test_generic_config.py b/tests/unit/testplan/common/config/test_generic_config.py similarity index 100% rename from test/unit/testplan/common/config/test_generic_config.py rename to tests/unit/testplan/common/config/test_generic_config.py diff --git a/test/unit/testplan/common/report/__init__.py b/tests/unit/testplan/common/report/__init__.py similarity index 100% rename from test/unit/testplan/common/report/__init__.py rename to tests/unit/testplan/common/report/__init__.py diff --git a/test/unit/testplan/common/report/test_base.py b/tests/unit/testplan/common/report/test_base.py similarity index 100% rename from test/unit/testplan/common/report/test_base.py rename to tests/unit/testplan/common/report/test_base.py diff --git a/test/unit/testplan/common/utils/__init__.py b/tests/unit/testplan/common/utils/__init__.py similarity index 100% rename from test/unit/testplan/common/utils/__init__.py rename to tests/unit/testplan/common/utils/__init__.py diff --git a/test/unit/testplan/common/utils/sockets/__init__.py b/tests/unit/testplan/common/utils/sockets/__init__.py similarity index 100% rename from test/unit/testplan/common/utils/sockets/__init__.py rename to tests/unit/testplan/common/utils/sockets/__init__.py diff --git a/test/unit/testplan/common/utils/sockets/test_message.py b/tests/unit/testplan/common/utils/sockets/test_message.py similarity index 100% rename from test/unit/testplan/common/utils/sockets/test_message.py rename to tests/unit/testplan/common/utils/sockets/test_message.py diff --git a/test/unit/testplan/common/utils/sockets/test_server.py b/tests/unit/testplan/common/utils/sockets/test_server.py similarity index 100% rename from test/unit/testplan/common/utils/sockets/test_server.py rename to tests/unit/testplan/common/utils/sockets/test_server.py diff --git a/test/unit/testplan/common/utils/test_comparison.py b/tests/unit/testplan/common/utils/test_comparison.py similarity index 100% rename from test/unit/testplan/common/utils/test_comparison.py rename to tests/unit/testplan/common/utils/test_comparison.py diff --git a/test/unit/testplan/common/utils/test_registry.py b/tests/unit/testplan/common/utils/test_registry.py similarity index 100% rename from test/unit/testplan/common/utils/test_registry.py rename to tests/unit/testplan/common/utils/test_registry.py diff --git a/test/unit/testplan/common/utils/test_table.py b/tests/unit/testplan/common/utils/test_table.py similarity index 100% rename from test/unit/testplan/common/utils/test_table.py rename to tests/unit/testplan/common/utils/test_table.py diff --git a/test/unit/testplan/common/utils/test_timing.py b/tests/unit/testplan/common/utils/test_timing.py similarity index 100% rename from test/unit/testplan/common/utils/test_timing.py rename to tests/unit/testplan/common/utils/test_timing.py diff --git a/test/unit/testplan/report/__init__.py b/tests/unit/testplan/report/__init__.py similarity index 100% rename from test/unit/testplan/report/__init__.py rename to tests/unit/testplan/report/__init__.py diff --git a/test/unit/testplan/report/test_styles.py b/tests/unit/testplan/report/test_styles.py similarity index 100% rename from test/unit/testplan/report/test_styles.py rename to tests/unit/testplan/report/test_styles.py diff --git a/test/unit/testplan/report/test_testing.py b/tests/unit/testplan/report/test_testing.py similarity index 100% rename from test/unit/testplan/report/test_testing.py rename to tests/unit/testplan/report/test_testing.py diff --git a/test/unit/testplan/runners/pools/tasks/__init__.py b/tests/unit/testplan/runners/pools/tasks/__init__.py similarity index 100% rename from test/unit/testplan/runners/pools/tasks/__init__.py rename to tests/unit/testplan/runners/pools/tasks/__init__.py diff --git a/test/unit/testplan/runners/pools/tasks/data/__init__.py b/tests/unit/testplan/runners/pools/tasks/data/__init__.py similarity index 100% rename from test/unit/testplan/runners/pools/tasks/data/__init__.py rename to tests/unit/testplan/runners/pools/tasks/data/__init__.py diff --git a/test/unit/testplan/runners/pools/tasks/data/relative/__init__.py b/tests/unit/testplan/runners/pools/tasks/data/relative/__init__.py similarity index 100% rename from test/unit/testplan/runners/pools/tasks/data/relative/__init__.py rename to tests/unit/testplan/runners/pools/tasks/data/relative/__init__.py diff --git a/test/unit/testplan/runners/pools/tasks/data/relative/sample_tasks.py b/tests/unit/testplan/runners/pools/tasks/data/relative/sample_tasks.py similarity index 100% rename from test/unit/testplan/runners/pools/tasks/data/relative/sample_tasks.py rename to tests/unit/testplan/runners/pools/tasks/data/relative/sample_tasks.py diff --git a/test/unit/testplan/runners/pools/tasks/data/sample_tasks.py b/tests/unit/testplan/runners/pools/tasks/data/sample_tasks.py similarity index 100% rename from test/unit/testplan/runners/pools/tasks/data/sample_tasks.py rename to tests/unit/testplan/runners/pools/tasks/data/sample_tasks.py diff --git a/test/unit/testplan/runners/pools/tasks/test_task_results.py b/tests/unit/testplan/runners/pools/tasks/test_task_results.py similarity index 100% rename from test/unit/testplan/runners/pools/tasks/test_task_results.py rename to tests/unit/testplan/runners/pools/tasks/test_task_results.py diff --git a/test/unit/testplan/runners/pools/tasks/test_tasks.py b/tests/unit/testplan/runners/pools/tasks/test_tasks.py similarity index 100% rename from test/unit/testplan/runners/pools/tasks/test_tasks.py rename to tests/unit/testplan/runners/pools/tasks/test_tasks.py diff --git a/test/unit/testplan/runners/pools/test_pool_base.py b/tests/unit/testplan/runners/pools/test_pool_base.py similarity index 100% rename from test/unit/testplan/runners/pools/test_pool_base.py rename to tests/unit/testplan/runners/pools/test_pool_base.py diff --git a/test/unit/testplan/runners/pools/test_process_worker.py b/tests/unit/testplan/runners/pools/test_process_worker.py similarity index 100% rename from test/unit/testplan/runners/pools/test_process_worker.py rename to tests/unit/testplan/runners/pools/test_process_worker.py diff --git a/test/unit/testplan/test_plan_base.py b/tests/unit/testplan/test_plan_base.py similarity index 100% rename from test/unit/testplan/test_plan_base.py rename to tests/unit/testplan/test_plan_base.py diff --git a/test/unit/testplan/testing/__init__.py b/tests/unit/testplan/testing/__init__.py similarity index 100% rename from test/unit/testplan/testing/__init__.py rename to tests/unit/testplan/testing/__init__.py diff --git a/test/unit/testplan/testing/multitest/__init__.py b/tests/unit/testplan/testing/multitest/__init__.py similarity index 100% rename from test/unit/testplan/testing/multitest/__init__.py rename to tests/unit/testplan/testing/multitest/__init__.py diff --git a/test/unit/testplan/testing/multitest/driver/__init__.py b/tests/unit/testplan/testing/multitest/driver/__init__.py similarity index 100% rename from test/unit/testplan/testing/multitest/driver/__init__.py rename to tests/unit/testplan/testing/multitest/driver/__init__.py diff --git a/test/unit/testplan/testing/multitest/driver/myapp/__init__.py b/tests/unit/testplan/testing/multitest/driver/myapp/__init__.py similarity index 100% rename from test/unit/testplan/testing/multitest/driver/myapp/__init__.py rename to tests/unit/testplan/testing/multitest/driver/myapp/__init__.py diff --git a/test/unit/testplan/testing/multitest/driver/myapp/config.yaml b/tests/unit/testplan/testing/multitest/driver/myapp/config.yaml similarity index 100% rename from test/unit/testplan/testing/multitest/driver/myapp/config.yaml rename to tests/unit/testplan/testing/multitest/driver/myapp/config.yaml diff --git a/test/unit/testplan/testing/multitest/driver/myapp/example_binary.py b/tests/unit/testplan/testing/multitest/driver/myapp/example_binary.py similarity index 100% rename from test/unit/testplan/testing/multitest/driver/myapp/example_binary.py rename to tests/unit/testplan/testing/multitest/driver/myapp/example_binary.py diff --git a/test/unit/testplan/testing/multitest/driver/myapp/test_app.py b/tests/unit/testplan/testing/multitest/driver/myapp/test_app.py similarity index 100% rename from test/unit/testplan/testing/multitest/driver/myapp/test_app.py rename to tests/unit/testplan/testing/multitest/driver/myapp/test_app.py diff --git a/test/unit/testplan/testing/multitest/driver/test_driver.py b/tests/unit/testplan/testing/multitest/driver/test_driver.py similarity index 100% rename from test/unit/testplan/testing/multitest/driver/test_driver.py rename to tests/unit/testplan/testing/multitest/driver/test_driver.py diff --git a/test/unit/testplan/testing/multitest/driver/test_http.py b/tests/unit/testplan/testing/multitest/driver/test_http.py similarity index 100% rename from test/unit/testplan/testing/multitest/driver/test_http.py rename to tests/unit/testplan/testing/multitest/driver/test_http.py diff --git a/test/unit/testplan/testing/multitest/driver/test_tcp_server.py b/tests/unit/testplan/testing/multitest/driver/test_tcp_server.py similarity index 100% rename from test/unit/testplan/testing/multitest/driver/test_tcp_server.py rename to tests/unit/testplan/testing/multitest/driver/test_tcp_server.py diff --git a/test/unit/testplan/testing/multitest/driver/test_zmq.py b/tests/unit/testplan/testing/multitest/driver/test_zmq.py similarity index 100% rename from test/unit/testplan/testing/multitest/driver/test_zmq.py rename to tests/unit/testplan/testing/multitest/driver/test_zmq.py diff --git a/test/unit/testplan/testing/multitest/entries/__init__.py b/tests/unit/testplan/testing/multitest/entries/__init__.py similarity index 100% rename from test/unit/testplan/testing/multitest/entries/__init__.py rename to tests/unit/testplan/testing/multitest/entries/__init__.py diff --git a/test/unit/testplan/testing/multitest/entries/test_assertions.py b/tests/unit/testplan/testing/multitest/entries/test_assertions.py similarity index 100% rename from test/unit/testplan/testing/multitest/entries/test_assertions.py rename to tests/unit/testplan/testing/multitest/entries/test_assertions.py diff --git a/test/unit/testplan/testing/multitest/entries/test_base.py b/tests/unit/testplan/testing/multitest/entries/test_base.py similarity index 100% rename from test/unit/testplan/testing/multitest/entries/test_base.py rename to tests/unit/testplan/testing/multitest/entries/test_base.py diff --git a/test/unit/testplan/testing/multitest/test_basic_multitest.py b/tests/unit/testplan/testing/multitest/test_basic_multitest.py similarity index 100% rename from test/unit/testplan/testing/multitest/test_basic_multitest.py rename to tests/unit/testplan/testing/multitest/test_basic_multitest.py diff --git a/test/unit/testplan/testing/multitest/test_result.py b/tests/unit/testplan/testing/multitest/test_result.py similarity index 100% rename from test/unit/testplan/testing/multitest/test_result.py rename to tests/unit/testplan/testing/multitest/test_result.py diff --git a/test/unit/testplan/testing/multitest/test_suite.py b/tests/unit/testplan/testing/multitest/test_suite.py similarity index 100% rename from test/unit/testplan/testing/multitest/test_suite.py rename to tests/unit/testplan/testing/multitest/test_suite.py diff --git a/test/unit/testplan/testing/test_filtering.py b/tests/unit/testplan/testing/test_filtering.py similarity index 100% rename from test/unit/testplan/testing/test_filtering.py rename to tests/unit/testplan/testing/test_filtering.py diff --git a/test/unit/testplan/testing/test_ordering.py b/tests/unit/testplan/testing/test_ordering.py similarity index 100% rename from test/unit/testplan/testing/test_ordering.py rename to tests/unit/testplan/testing/test_ordering.py diff --git a/test/unit/testplan/web_ui/__init__.py b/tests/unit/testplan/web_ui/__init__.py similarity index 100% rename from test/unit/testplan/web_ui/__init__.py rename to tests/unit/testplan/web_ui/__init__.py diff --git a/test/unit/testplan/web_ui/test_web_app.py b/tests/unit/testplan/web_ui/test_web_app.py similarity index 100% rename from test/unit/testplan/web_ui/test_web_app.py rename to tests/unit/testplan/web_ui/test_web_app.py diff --git a/test/unit/testplan/web_ui/testing/test_jest.py b/tests/unit/testplan/web_ui/testing/test_jest.py similarity index 100% rename from test/unit/testplan/web_ui/testing/test_jest.py rename to tests/unit/testplan/web_ui/testing/test_jest.py