Merge pull request #817 from simvue-io/wk9874/fixing_tests_2.1.2

Wk9874/fixing tests 2.1.2

Author: kzscisoft

.github/workflows/test_client_ubuntu.yml

@@ -91,7 +91,7 @@ jobs:
         SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
       run: >-
         python -m pytest tests/functional/ -x
-        -m online -c /dev/null -p no:warnings
+        -m online -m "not eco" -c /dev/null -p no:warnings
         -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
   offline_functional_tests:
     runs-on: ubuntu-latest

simvue/factory/proxy/base.py

@@ -14,8 +14,8 @@ def __init__(
         self._logger = logging.getLogger(f"simvue.{self.__class__.__name__}")
         self._suppress_errors: bool = suppress_errors
         self._uuid: str = uniq_id
-        self._name: str | None = name
-        self._id: int | None = None
+        self.name: str | None = name
+        self.id: int | None = None
         self._aborted: bool = False
 
     def _error(self, message: str) -> None:

simvue/factory/proxy/offline.py

@@ -74,8 +74,8 @@ def create_run(self, data) -> tuple[str, str | None]:
             self._logger.error("No directory specified")
             return (None, None)
 
-        if not self._name:
-            self._name = randomname.get_name()
+        if not self.name:
+            self.name = randomname.get_name()
 
         try:
             os.makedirs(self._directory, exist_ok=True)
@@ -98,7 +98,7 @@ def create_run(self, data) -> tuple[str, str | None]:
         filename = f"{self._directory}/{status}"
         create_file(filename)
 
-        return self._name, self._id
+        return self.name, self.id
 
     @skip_if_failed("_aborted", "_suppress_errors", None)
     def update(self, data) -> dict[str, typing.Any] | None:
@@ -171,7 +171,7 @@ def set_alert_state(
         with open(_alert_file) as alert_in:
             _alert_data = json.load(alert_in)
 
-        _alert_data |= {"run": self._id, "alert": alert_id, "status": status}
+        _alert_data |= {"run": self.id, "alert": alert_id, "status": status}
 
         self._write_json(_alert_file, _alert_data)
 

simvue/factory/proxy/remote.py

@@ -39,14 +39,14 @@ def __init__(
         }
         super().__init__(name, uniq_id, suppress_errors)
 
-        self._id = uniq_id
+        self.id = uniq_id
 
     @skip_if_failed("_aborted", "_suppress_errors", None)
     def list_tags(self) -> list[str]:
         logger.debug("Retrieving existing tags")
         try:
             response = get(
-                f"{self._user_config.server.url}/runs/{self._id}", self._headers
+                f"{self._user_config.server.url}/runs/{self.id}", self._headers
             )
         except Exception as err:
             self._error(f"Exception retrieving tags: {str(err)}")
@@ -120,12 +120,12 @@ def create_run(self, data) -> tuple[str, str | None]:
             return (None, None)
 
         if "name" in response.json():
-            self._name = response.json()["name"]
+            self.name = response.json()["name"]
 
         if "id" in response.json():
-            self._id = response.json()["id"]
+            self.id = response.json()["id"]
 
-        return self._name, self._id
+        return self.name, self.id
 
     @skip_if_failed("_aborted", "_suppress_errors", None)
     def update(
@@ -134,8 +134,8 @@ def update(
         """
         Update metadata, tags or status
         """
-        if self._id:
-            data["id"] = self._id
+        if self.id:
+            data["id"] = self.id
 
         logger.debug('Updating run with data: "%s"', data)
 
@@ -296,7 +296,7 @@ def save_file(self, data: dict[str, typing.Any]) -> dict[str, typing.Any] | None
                     return None
 
         if storage_id:
-            path = f"{self._user_config.server.url}/runs/{self._id}/artifacts"
+            path = f"{self._user_config.server.url}/runs/{self.id}/artifacts"
             data["storage"] = storage_id
 
             try:
@@ -350,7 +350,7 @@ def set_alert_state(self, alert_id, status) -> dict[str, typing.Any] | None:
         """
         Set alert state
         """
-        data = {"run": self._id, "alert": alert_id, "status": status}
+        data = {"run": self.id, "alert": alert_id, "status": status}
         try:
             response = put(
                 f"{self._user_config.server.url}/alerts/status", self._headers, data
@@ -445,7 +445,7 @@ def send_heartbeat(self) -> dict[str, typing.Any] | None:
             response = put(
                 f"{self._user_config.server.url}/runs/heartbeat",
                 self._headers,
-                {"id": self._id},
+                {"id": self.id},
             )
         except Exception as err:
             self._error(f"Exception creating run: {str(err)}")
@@ -465,7 +465,7 @@ def get_abort_status(self) -> bool:
 
         try:
             response = get(
-                f"{self._user_config.server.url}/runs/{self._id}/abort",
+                f"{self._user_config.server.url}/runs/{self.id}/abort",
                 self._headers_mp,
             )
         except Exception as err:

simvue/run.py

@@ -257,7 +257,9 @@ def __exit__(
     ) -> None:
         logger.debug(
             "Automatically closing run '%s' in status %s",
-            self.id if self._user_config.run.mode == "online" else "unregistered",
+            self.id
+            if self._user_config.run.mode == "online" and self._sv_obj
+            else "unregistered",
             self._status,
         )
 
@@ -940,7 +942,10 @@ def executor(self) -> Executor:
     def name(self) -> str | None:
         """Return the name of the run"""
         if not self._sv_obj:
-            raise RuntimeError("Run has not been initialised")
+            logger.warning(
+                "Attempted to get name on non initialized run - returning None"
+            )
+            return None
         return self._sv_obj.name
 
     @property
@@ -954,7 +959,10 @@ def status(
     ):
         """Return the status of the run"""
         if not self._sv_obj:
-            raise RuntimeError("Run has not been initialised")
+            logger.warning(
+                "Attempted to get name on non initialized run - returning cached value"
+            )
+            return self._status
         return self._sv_obj.status
 
     @property
@@ -966,7 +974,10 @@ def uid(self) -> str:
     def id(self) -> str | None:
         """Return the unique id of the run"""
         if not self._sv_obj:
-            raise RuntimeError("Run has not been initialised")
+            logger.warning(
+                "Attempted to get name on non initialized run - returning None"
+            )
+            return None
         return self._sv_obj.id
 
     @skip_if_failed("_aborted", "_suppress_errors", False)
@@ -986,9 +997,8 @@ def reconnect(self, run_id: str) -> bool:
         """
         self._status = "running"
 
-        self._id = run_id
         self._sv_obj = RunObject(identifier=run_id, _read_only=False)
-        self._name = self._sv_obj.name
+
         self._sv_obj.status = self._status
         self._sv_obj.system = get_system()
         self._sv_obj.commit()