more

phlop/os.py

@@ -7,6 +7,7 @@
 
 import contextlib
 import os
+import platform
 from pathlib import Path
 
 
@@ -45,3 +46,7 @@ def write_to_file(file, contents, mode="w", skip_if_empty=True):
                 f.write(contents)
         except IOError as e:
             raise RuntimeError(f"Failed to write to file {file}: {e}")
+
+
+def env_sep():
+    return ";" if any(platform.win32_ver()) else ":"

phlop/reflection.py

@@ -14,7 +14,9 @@
 
 
 def classes_in_file(file, subclasses_only=None, fail_on_import_error=True):
+    assert file
     module = str(file).replace(os.path.sep, ".")[:-3]
+    assert module
 
     if subclasses_only is not None and not isinstance(subclasses_only, list):
         subclasses_only = [subclasses_only]

phlop/sys.py

@@ -5,6 +5,7 @@
 #
 
 
+import os
 import sys
 from contextlib import contextmanager
 
@@ -19,3 +20,14 @@ def extend_sys_path(paths):
         yield
     finally:
         sys.path = old_path
+
+
+@contextmanager
+def extend_env(**environ):
+    old_env = dict(os.environ)
+    os.environ.update(environ)
+    try:
+        yield
+    finally:
+        os.environ.clear()
+        os.environ.update(old_env)

phlop/testing/test_cases.py

@@ -11,9 +11,10 @@
 from pathlib import Path
 
 from phlop.app.cmake import list_tests as get_cmake_tests
-from phlop.os import pushd
+from phlop.os import env_sep
 from phlop.proc import run
 from phlop.reflection import classes_in_file
+from phlop.sys import extend_sys_path
 
 _LOG_DIR = Path(os.environ.get("PHLOP_LOG_DIR", os.getcwd()))
 
@@ -25,6 +26,9 @@ class TestCase:
     working_dir: str = field(default_factory=lambda: None)
     log_file_path: str = field(default_factory=lambda: None)
 
+    def __post_init__(self):
+        self.cmd = self.cmd.strip()
+
 
 class TestBatch:
     def __init__(self, tests, cores=1):
@@ -101,13 +105,11 @@ def load_test_cases_in(
 
 
 def load_test_cases_from_cmake(ctest_test):
-    ppath = f"{ctest_test.working_dir}:{ctest_test.env.get('PYTHONPATH','')}"
-    ctest_test.env["PYTHONPATH"] = ppath
-    with pushd(ctest_test.working_dir):
-        print("ctest_test", ctest_test.cmd)
+    ppath = ctest_test.env.get("PYTHONPATH", "")
+    with extend_sys_path([ctest_test.working_dir] + ppath.split(env_sep())):
         pyfile = ctest_test.cmd.split(" ")[-1]
         return load_test_cases_in(
-            classes_in_file(pyfile, unittest.TestCase, fail_on_import_error=False),
+            classes_in_file(pyfile, unittest.TestCase, fail_on_import_error=True),
             env=ctest_test.env,
             working_dir=ctest_test.working_dir,
             log_file_path=_LOG_DIR

pyproject.toml

@@ -1,14 +1,14 @@
 [project]
 name = "phlop"
-version = "0.0.7"
+version = "0.0.8"
 
 dependencies = [
 
 ]
 
 description = "stuff and things"
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="phlop",
-    version="0.0.7",
+    version="0.0.8",
     cmdclass={},
     classifiers=[],
     include_package_data=True,