Allow for conftest.py in sub directories.

Author: ntoll

config.json

@@ -4,6 +4,9 @@
         "./tests/__init__.py": "tests/__init__.py",
         "./tests/conftest.py": "tests/conftest.py",
         "./tests/test_core_functionality.py": "tests/test_core_functionality.py",
-        "./tests/test_with_setup_teardown.py": "tests/test_with_setup_teardown.py"
+        "./tests/test_with_setup_teardown.py": "tests/test_with_setup_teardown.py",
+        "./tests/inner_tests/__init__.py": "tests/inner_tests/__init__.py",
+        "./tests/inner_tests/test_inner.py": "tests/inner_tests/test_inner.py",
+        "./tests/inner_tests/conftest.py": "tests/inner_tests/conftest.py"
     }
 }

main.py

@@ -30,13 +30,13 @@
 
 expected_results = {
     "result_all": {
-        "passes": 14,
-        "fails": 12,
+        "passes": 15,
+        "fails": 13,
         "skipped": 8,
     },
     "result_random": {
-        "passes": 14,
-        "fails": 12,
+        "passes": 15,
+        "fails": 13,
         "skipped": 8,
     },
     "result_module": {

tests/inner_tests/__init__.py

@@ -0,0 +1,9 @@
+from pyscript import window
+
+
+def setup():
+    window.console.log("Setup from inner conftest.py")
+
+
+def teardown():
+    window.console.log("Teardown from inner conftest.py")

tests/inner_tests/conftest.py

@@ -0,0 +1,16 @@
+"""
+Some tests in a submodule. Ensures the inner conftest is used / read.
+"""
+
+def test_passes():
+    """
+    A test function that passes with a true assertion.
+    """
+    assert True, "This test passes"
+
+
+def test_fails():
+    """
+    A test function that fails with a false assertion.
+    """
+    assert False, "This test will fail"

tests/inner_tests/test_inner.py

@@ -349,7 +349,7 @@ def gather_conftest_functions(conftest_path, target):
     conftest_path = str(conftest_path)
     if os.path.exists(conftest_path):
         print(
-            f"Using \033[1m{conftest_path}\033[0m for global setup and teardown in \033[1m{target}\033[0m."
+            f"Using \033[1m{conftest_path}\033[0m for setup and teardown for tests in \033[1m{target}\033[0m."
         )
         conftest = import_module(conftest_path)
         setup = conftest.setup if hasattr(conftest, "setup") else None
@@ -378,24 +378,57 @@ def discover(targets, pattern, setup=None, teardown=None):
     setup and teardown functions can be overridden in the individual test
     modules.
     """
+    # To contain the various conftest.py modules for subdirectories. The key
+    # will be the directory path, and the value will be a tuple containing the
+    # setup and teardown functions.
+    conftests = {}
+    # To contain the TestModule instances.
     result = []
     for target in targets:
         if "::" in target:
             conftest_path = Path(target.split("::")[0]).parent / "conftest.py"
-            setup, teardown = gather_conftest_functions(conftest_path, target)
+            if str(conftest_path) not in conftests:
+                conftests[str(conftest_path)] = gather_conftest_functions(
+                    conftest_path, target
+                )
+            setup, teardown = conftests[str(conftest_path)]
             module_path, test_names = target.split("::")
             module_instance = import_module(module_path)
             module = TestModule(module_path, module_instance, setup, teardown)
             module.limit_tests_to(test_names.split(","))
             result.append(module)
         elif os.path.isdir(target):
             conftest_path = Path(target) / "conftest.py"
-            setup, teardown = gather_conftest_functions(conftest_path, target)
+            if str(conftest_path) not in conftests:
+                conftests[str(conftest_path)] = gather_conftest_functions(
+                    conftest_path, target
+                )
+            setup, teardown = conftests[str(conftest_path)]
             for module_path in Path(target).rglob(pattern):
                 module_instance = import_module(module_path)
-                module = TestModule(
-                    module_path, module_instance, setup, teardown
-                )
+                parent_dir = "/".join(str(module_path).split("/")[:-1])
+                if parent_dir != target:
+                    # This is a module in a subdirectory of the target
+                    # directory, so ensure any conftest.py in the sub directory
+                    # is imported for setup and teardown.
+                    conftest_path = Path(parent_dir) / "conftest.py"
+                    if str(conftest_path) not in conftests:
+                        conftests[str(conftest_path)] = (
+                            gather_conftest_functions(
+                                conftest_path, parent_dir
+                            )
+                        )
+                    local_setup, local_teardown = conftests[str(conftest_path)]
+                    module = TestModule(
+                        module_path,
+                        module_instance,
+                        local_setup,
+                        local_teardown,
+                    )
+                else:
+                    module = TestModule(
+                        module_path, module_instance, setup, teardown
+                    )
                 result.append(module)
         else:
             conftest_path = Path(target).parent / "conftest.py"