ci: fix run

ansys · Nov 26, 2024 · 88c0713 · 88c0713
1 parent 4971300
commit 88c0713
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/.ci/fluent_test_runner.py b/.ci/fluent_test_runner.py
@@ -86,22 +86,25 @@ def run_fluent_test(
         stderr=True,
         auto_remove=True,
     )
-    while True:
-        container.reload()
-        if container.status == "exited":
-            break
-        stderr = container.logs(stdout=False, stderr=True)
-        if stderr:
-            stderr = stderr.decode()
-            for line in stderr.split("\n"):
-                if line.strip().startswith("Error:"):
-                    if "Expected exception" in line:  # for check_assert.py
-                        container.stop()
-                    else:
-                        raise FluentRuntimeError(line)
-        sleep(1)
-    logging.debug(container.logs(stderr=True).decode())
-    container.remove()
+    try:
+        while True:
+            container.reload()
+            if container.status == "exited":
+                break
+            stderr = container.logs(stdout=False, stderr=True)
+            if stderr:
+                stderr = stderr.decode()
+                for line in stderr.split("\n"):
+                    if line.strip().startswith("Error:"):
+                        if "Expected exception" in line:  # for check_assert.py
+                            container.stop()
+                        else:
+                            raise FluentRuntimeError(line)
+            sleep(1)
+        logging.debug(container.logs(stderr=True).decode())
+        container.remove()
+    except docker.errors.NotFound:
+        pass
 
 
 MAX_TEST_PATH_LENGTH = 100

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -102,7 +102,6 @@ def pytest_collection_finish(session):
             if skip:
                 continue
             fluent_test_dir = fluent_test_root / item.module.__name__ / item.name
-            fluent_test_dir.mkdir(parents=True, exist_ok=True)
             fluent_test_config = fluent_test_dir / "test.yaml"
             fluent_test_file = fluent_test_dir / "test.py"
             launcher_args = ""
@@ -122,18 +121,24 @@ def pytest_collection_finish(session):
                 if param in launcher_args_by_fixture:
                     launcher_args = launcher_args_by_fixture[param]
                     break
+            fluent_test_dir.mkdir(parents=True, exist_ok=True)
             with open(fluent_test_config, "w") as f:
                 f.write(f"launcher_args: {launcher_args}\n")
             with open(fluent_test_file, "w") as f:
-                f.write(f"from ....{item.module.__name__} import {item.name}\n")
-                f.write("from ....fluent_fixtures import (\n")
+                f.write("import sys\n")
+                f.write('sys.path.append("/testing")\n')
+                f.write(
+                    f"from {item.module.__name__} import {item.name}  # noqa: E402\n"
+                )
+                f.write("from fluent_fixtures import (  # noqa: E402\n")
                 for param in parameters:
                     f.write(f"    {param},\n")
                 f.write(")\n")
                 f.write("\n")
                 f.write(f"{item.name}(")
                 f.write(", ".join([f"{p}(globals())" for p in parameters]))
                 f.write(")\n")
+                f.write("exit()\n")
             print(f"Written {fluent_test_file}")
         session.items = []
         session.testscollected = 0