fix: Fix test execution

Author: Alan Christie

tests/instance_launcher.py

@@ -106,7 +106,7 @@ def launch(self, *, launch_parameters: LaunchParameters) -> LaunchResult:
             )
 
         # Now add the running workflow ID ot the instance record.
-        self._api_adapter.set_instance_running_workflow_id(
+        self._api_adapter.set_instance_running_workflow_step_id(
             instance_id=instance_id,
             running_workflow_step_id=rwfs_id,
         )

tests/test_test_wapi_adapter.py

@@ -324,20 +324,9 @@ def test_get_running_workflow_step_with_prior_step():
 def test_create_instance():
     # Arrange
     utaa = UnitTestWorkflowAPIAdapter()
-    response = utaa.create_workflow(workflow_definition={"name": "blah"})
-    response = utaa.create_running_workflow(
-        user_id="dlister",
-        workflow_id=response["id"],
-        project_id=TEST_PROJECT_ID,
-        variables={},
-    )
-    response, _ = utaa.create_running_workflow_step(
-        running_workflow_id=response["id"], step="step-1", instance_id=_I_ID
-    )
-    rwfs_id = response["id"]
 
     # Act
-    response = utaa.create_instance(running_workflow_step_id=rwfs_id)
+    response = utaa.create_instance()
 
     # Assert
     assert "id" in response
@@ -346,79 +335,14 @@ def test_create_instance():
 def test_create_and_get_instance():
     # Arrange
     utaa = UnitTestWorkflowAPIAdapter()
-    response = utaa.create_workflow(workflow_definition={"name": "blah"})
-    response = utaa.create_running_workflow(
-        user_id="dlister",
-        workflow_id=response["id"],
-        project_id=TEST_PROJECT_ID,
-        variables={},
-    )
-    response, _ = utaa.create_running_workflow_step(
-        running_workflow_id=response["id"], step="step-1", instance_id=_I_ID
-    )
-    rwfs_id = response["id"]
-    response = utaa.create_instance(running_workflow_step_id=rwfs_id)
+    response = utaa.create_instance()
     instance_id = response["id"]
 
     # Act
     response, _ = utaa.get_instance(instance_id=instance_id)
 
     # Assert
-    assert response["running_workflow_step_id"] == rwfs_id
-
-
-def test_create_instance_and_get_step_instance_directory():
-    # Arrange
-    utaa = UnitTestWorkflowAPIAdapter()
-    response = utaa.create_workflow(workflow_definition={"name": "blah"})
-    response = utaa.create_running_workflow(
-        user_id="dlister",
-        workflow_id=response["id"],
-        project_id=TEST_PROJECT_ID,
-        variables={},
-    )
-    response, _ = utaa.create_running_workflow_step(
-        running_workflow_id=response["id"], step="step-1", instance_id=_I_ID
-    )
-    rwfs_id = response["id"]
-    response = utaa.create_instance(running_workflow_step_id=rwfs_id)
-    i_id = response["id"]
-
-    # Act
-    response, _ = utaa.get_running_workflow_step(running_workflow_step_id=rwfs_id)
-
-    # Assert
-    assert "instance_directory" in response
-    assert response["instance_directory"] == f".{i_id}"
-
-
-def test_create_instance_and_get_step_instance_directory_by_name():
-    # Arrange
-    utaa = UnitTestWorkflowAPIAdapter()
-    response = utaa.create_workflow(workflow_definition={"name": "blah"})
-    wf_id = response["id"]
-    response = utaa.create_running_workflow(
-        user_id="dlister",
-        workflow_id=wf_id,
-        project_id=TEST_PROJECT_ID,
-        variables={},
-    )
-    rwf_id = response["id"]
-    response, _ = utaa.create_running_workflow_step(
-        running_workflow_id=rwf_id, step="step-1", instance_id=_I_ID
-    )
-    rwfs_id = response["id"]
-    response = utaa.create_instance(running_workflow_step_id=rwfs_id)
-    i_id = response["id"]
-
-    # Act
-    response, _ = utaa.get_running_workflow_step_by_name(
-        running_workflow_id=rwf_id, name="step-1"
-    )
-
-    # Assert
-    assert "instance_directory" in response
-    assert response["instance_directory"] == f".{i_id}"
+    assert response["running_workflow_step_id"] == ""
 
 
 def test_get_running_workflow_step_by_name():

tests/wapi_adapter.py

@@ -352,22 +352,29 @@ def create_instance(self) -> dict[str, Any]:
         next_id: int = len(instances) + 1
         instance_id: str = _INSTANCE_ID_FORMAT.format(id=next_id)
 
+        record = {
+            "id": "instance_id",
+            "running_workflow_step_id": "",
+            "instance_directory": f".{instance_id}",
+        }
+        instances[instance_id] = record
+
         with open(_INSTANCE_PICKLE_FILE, "wb") as pickle_file:
             Pickler(pickle_file).dump(instances)
 
         UnitTestWorkflowAPIAdapter.lock.release()
 
         return {"id": instance_id}
 
-    def set_instance_running_workflow_id(
+    def set_instance_running_workflow_step_id(
         self, *, instance_id: str, running_workflow_step_id: str
     ) -> None:
         UnitTestWorkflowAPIAdapter.lock.acquire()
         with open(_INSTANCE_PICKLE_FILE, "rb") as pickle_file:
             instances = Unpickler(pickle_file).load()
 
         assert instance_id in instances
-        instances["running_workflow_step_id"] = running_workflow_step_id
+        instances[instance_id]["running_workflow_step_id"] = running_workflow_step_id
 
         with open(_INSTANCE_PICKLE_FILE, "wb") as pickle_file:
             Pickler(pickle_file).dump(instances)