Merge pull request morganstanley#147 from ryan-collingham/rlc/move_tests

Move test/ -> tests/ to avoid name clash with stdlib

.travis.yml

@@ -10,5 +10,5 @@ install:
 
 script:
   - pylint --rcfile pylintrc testplan
-  - pytest test --verbose
+  - pytest tests --verbose
 

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

test/functional/examples/test_examples.py → 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'))
     ],

test/functional/testplan/test_timeout.py → 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):

test/functional/testplan/testing/cpp/test_gtest.py → 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__)),

test/functional/testplan/testing/cpp/test_hobbestest.py → 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__)),