🧪 Various test fixes based on Windows issues

Author: zarethrex

simvue/api/objects/base.py

@@ -563,6 +563,9 @@ def _post(self, is_json: bool = True, **kwargs) -> dict[str, typing.Any]:
         if _id := _json_response.get("id"):
             self._logger.debug("'%s' created successfully", _id)
             self._identifier = _id
+        else:
+            _detail = _json_response.get("detail", "")
+            raise RuntimeError(f"Expected new ID for {self._label} but none found: {_detail}.")
 
         return _json_response
 

tests/conftest.py

@@ -7,6 +7,7 @@
 import tempfile
 import os
 import json
+import platform
 import pathlib
 import logging
 import requests
@@ -43,8 +44,8 @@ def emit(self, record):
 
 
 def clear_out_files() -> None:
-    out_files = list(pathlib.Path.cwd().glob("test_*.out"))
-    out_files += list(pathlib.Path.cwd().glob("test_*.err"))
+    out_files = list(pathlib.Path.cwd().glob(f"test_*_{os.environ.get("PYTEST_XDIST_WORKER", 0)}.out"))
+    out_files += list(pathlib.Path.cwd().glob(f"test_*_{os.environ.get("PYTEST_XDIST_WORKER", 0)}.err"))
 
     for file_obj in out_files:
         file_obj.unlink()
@@ -213,7 +214,7 @@ def setup_test_run(run: sv_run.Run, create_objects: bool, request: pytest.Fixtur
             "test_identifier": f"{_test_name}_{fix_use_id}"
         },
         "folder": f"/simvue_unit_testing/{fix_use_id}",
-        "tags": ["simvue_client_unit_tests", _test_name]
+        "tags": ["simvue_client_unit_tests", _test_name, f"{platform.system()}"]
     }
 
     if os.environ.get("CI"):

tests/functional/test_client.py

@@ -1,4 +1,5 @@
 import pytest
+import platform
 import uuid
 import random
 import os.path
@@ -39,7 +40,7 @@ def test_get_alerts(
     run.init(
         "test_get_alerts",
         folder=f"/simvue_unit_testing/{unique_id}",
-        tags=["test_get_alerts"],
+        tags=["test_get_alerts", platform.system()],
         retention_period="2 mins",
     )
     run_id = run.id
@@ -249,8 +250,11 @@ def test_get_runs(
         output_format=output_format,
         count_limit=10,
         sort_by_columns=sorting,
-        timing_info=True,
-        system_info=True,
+        timing_info=timing_info,
+        system_info=system_info,
+        metrics=metrics,
+        metadata=metadata,
+        alerts=alerts,
         attributes=attributes
     )
 
@@ -325,7 +329,7 @@ def test_run_deletion() -> None:
     run.init(
         name="test_run_deletion",
         folder="/simvue_unit_testing",
-        tags=["test_run_deletion"],
+        tags=["test_run_deletion", platform.system()],
         retention_period="1 min",
     )
     run.log_metrics({"x": 2})
@@ -344,7 +348,7 @@ def test_runs_deletion() -> None:
         run.init(
             name="test_runs_deletion",
             folder="/simvue_unit_testing/runs_batch",
-            tags=["test_runs_deletion"],
+            tags=["test_runs_deletion", platform.system()],
             retention_period="1 min",
         )
         run.log_metrics({"x": i})
@@ -359,7 +363,7 @@ def test_runs_deletion() -> None:
 @pytest.mark.object_retrieval
 def test_get_tags() -> None:
     _uuid = f"{uuid.uuid4()}".split("-")[0]
-    tags = ["simvue_unit_testing", "test_get_tags", "testing", _uuid]
+    tags = ["simvue_unit_testing", "test_get_tags", "testing", _uuid, platform.system()]
 
     with sv_run.Run() as run:
         run.init(
@@ -390,7 +394,7 @@ def test_folder_deletion() -> None:
     run.init(
         name="test_folder_deletion",
         folder=f"/simvue_unit_testing/{_temp_folder_id}",
-        tags=["test_folder_deletion"],
+        tags=["test_folder_deletion", platform.system()],
         retention_period="1 min",
     )
     run.close()
@@ -418,7 +422,7 @@ def test_run_folder_metadata_find() -> None:
     with sv_run.Run() as run:
         run.init(
             "test_run_folder_metadata_find",
-            tags=["test_run_folder_metadata_find", "testing"],
+            tags=["test_run_folder_metadata_find", "testing", platform.system()],
             folder=(_folder := f"/simvue_unit_testing/{_uuid}"),
             retention_period="2 mins"
         )
@@ -438,7 +442,7 @@ def test_tag_deletion() -> None:
         run.init(
             name="test_folder_deletion",
             folder=f"/simvue_unit_testing/{unique_id}",
-            tags=["test_tag_deletion"],
+            tags=["test_tag_deletion", platform.system()],
             retention_period="1 min",
         )
         run.update_tags([(tag_str := f"delete_me_{unique_id}")])

tests/functional/test_executor.py

@@ -1,5 +1,6 @@
 import contextlib
 import typing
+import platform
 import uuid
 import pytest
 import simvue
@@ -33,12 +34,12 @@ def completion_callback(*_, trigger=trigger, **__):
     run = simvue.Run()
     run.init(
         f"test_executor_{'success' if successful else 'fail'}",
-        tags=["simvue_client_unit_tests", request.node.name.replace("[", "_").replace("]", "_")],
+        tags=[platform.system(), "simvue_client_unit_tests", request.node.name.replace("[", "_").replace("]", "_")],
         folder=f"/simvue_unit_testing/{folder_id}",
         retention_period="2 mins"
     )
     run.add_process(
-        identifier=f"test_add_process_{'success' if successful else 'fail'}",
+        identifier=f"test_add_process_{'success' if successful else 'fail'}_{os.environ.get("PYTEST_XDIST_WORKER", 0)}",
         c=f"exit {0 if successful else 1}",
         executable="bash" if sys.platform != "win32" else "powershell",
         completion_callback=completion_callback
@@ -71,7 +72,7 @@ def test_executor_multiprocess(request: pytest.FixtureRequest) -> None:
             run.init(
                 "test_executor_multiprocess",
                 folder=f"/simvue_unit_testing/{folder_id}",
-                tags=["simvue_client_tests", request.node.name]
+                tags=[platform.system(), "simvue_client_tests", request.node.name]
             )
 
             for i in range(10):
@@ -82,7 +83,7 @@ def callback(*_, evts=events, ident=i, **__):
                 callbacks[i] = callback
                 out_file = pathlib.Path(tempd).joinpath(f"out_file_{i}.dat")
                 run.add_process(
-                    f"cmd_{i}",
+                    f"cmd_{i}_{os.environ.get("PYTEST_XDIST_WORKER", 0)}",
                     executable="bash",
                     c="for i in {0..10}; do sleep 0.5; echo $i >> "+ f"{out_file}; done",
                     completion_trigger=triggers[i],
@@ -136,10 +137,10 @@ def test_add_process_command_assembly(request: pytest.FixtureRequest) -> None:
             run.init(
                 "test_advanced_executor",
                 folder=f"/simvue_unit_testing/{folder_id}",
-                tags=["simvue_client_tests", request.node.name]
+                tags=[platform.system(), "simvue_client_tests", request.node.name]
             )
             run.add_process(
-                identifier=(exe_id := "advanced_run"),
+                identifier=(exe_id := f"advanced_run_{os.environ.get("PYTEST_XDIST_WORKER", 0)}"),
                 executable="python",
                 script=f"{code_file}",
                 input_file=f"{in_file}",
@@ -162,10 +163,10 @@ def completion_callback(*_, success: dict[str, bool]=success, **__):
         run.init(
             "test_completion_callbacks_var_change",
             folder=f"/simvue_unit_testing/{folder_id}",
-            tags=["simvue_client_tests", request.node.name]
+            tags=[platform.system(), "simvue_client_tests", request.node.name]
         )
         run.add_process(
-            identifier="test_completion_callbacks_var_change",
+            identifier=f"test_completion_callbacks_var_change_{os.environ.get("PYTEST_XDIST_WORKER", 0)}",
             executable="bash",
             c="exit 0",
             completion_callback=completion_callback
@@ -190,10 +191,10 @@ def test_completion_trigger_set(request: pytest.FixtureRequest) -> None:
         run.init(
             "test_completion_trigger_set",
             folder=f"/simvue_unit_testing/{folder_id}",
-            tags=["simvue_client_tests", request.node.name]
+            tags=[platform.system(), "simvue_client_tests", request.node.name]
         )
         run.add_process(
-            identifier="test_completion_trigger_set",
+            identifier=f"test_completion_trigger_set_{os.environ.get("PYTEST_XDIST_WORKER", 0)}",
             executable="bash",
             c="exit 0",
             completion_trigger=trigger
@@ -221,10 +222,10 @@ def completion_callback(*_, trigger=trigger, **__):
         run.init(
             "test_completion_callbacks_trigger_set",
             folder="/simvue_unit_testing",
-            tags=["simvue_client_tests", request.node.name]
+            tags=[platform.system(), "simvue_client_tests", request.node.name]
         )
         run.add_process(
-            identifier="test_completion_callbacks_trigger_set",
+            identifier=f"test_completion_callbacks_trigger_set_{os.environ.get("PYTEST_XDIST_WORKER", 0)}",
             executable="bash",
             c="exit 0",
             completion_callback=completion_callback

tests/functional/test_run_artifact_upload.py

@@ -7,7 +7,7 @@
 import tempfile
 import pytest
 
-from simvue.api.objects import Run, FileArtifact, storage
+from simvue.api.objects import Run, FileArtifact
 from simvue.api.objects.folder import Folder
 
 
@@ -20,21 +20,23 @@ def test_add_artifact_to_run() -> None:
     _run.status = "running"
     _run.commit()
 
-    with tempfile.NamedTemporaryFile() as tempf:
+    with tempfile.NamedTemporaryFile(delete=False) as tempf:
         with open(tempf.name, "w") as in_f:
             in_f.write("Hello")
 
         _artifact = FileArtifact.new(
             name=f"test_{_uuid}",
             storage=None,
-            file_path=pathlib.Path(tempf.name),
+            file_path=(_temp_file := pathlib.Path(tempf.name)),
             mime_type=None,
             metadata=None
         )
         _artifact.attach_to_run(_run.id, "input")
     _run.status = "completed"
     _run.commit()
     assert _run.artifacts
+    _temp_file.unlink()
     _run.delete()
     _folder.delete(recursive=True, delete_runs=True)
 
+