fix: Better project ID location

Author: Alan Christie

tests/config.py

@@ -0,0 +1,5 @@
+"""An emulation of the Data Manager config module.
+A location of common constants."""
+
+# The project ID used in the tests (there is only one atm)
+TEST_PROJECT_ID: str = "project-00000000-0000-0000-0000-000000000001"

tests/instance_launcher.py

@@ -7,6 +7,7 @@
 from informaticsmatters.protobuf.datamanager.pod_message_pb2 import PodMessage
 
 from tests.api_adapter import UnitTestAPIAdapter
+from tests.config import TEST_PROJECT_ID
 from tests.message_dispatcher import UnitTestMessageDispatcher
 from workflow.workflow_abc import InstanceLauncher, LaunchResult
 
@@ -52,8 +53,7 @@ def launch(
         assert workflow_id
         assert step_specification
 
-        # Project must be `project-00000000-0000-0000-0000-000000000001`
-        assert project_id == "project-00000000-0000-0000-0000-000000000001"
+        assert project_id == TEST_PROJECT_ID
 
         # We're passed a RunningWorkflowStep ID but a record is expected to have been
         # created bt the caller, we simply create instance records.

tests/test_test_api_adapter.py

@@ -5,6 +5,7 @@
 pytestmark = pytest.mark.unit
 
 from tests.api_adapter import UnitTestAPIAdapter
+from tests.config import TEST_PROJECT_ID
 
 
 def test_get_nop_job():
@@ -76,7 +77,7 @@ def test_create_running_workflow():
     # Act
     response = utaa.create_running_workflow(
         workflow_id=response["id"],
-        project_id="project-00000000-0000-0000-0000-000000000001",
+        project_id=TEST_PROJECT_ID,
     )
 
     # Assert
@@ -89,7 +90,7 @@ def test_get_running_workflow():
     response = utaa.create_workflow(workflow_definition={"name": "blah"})
     wfid = response["id"]
     response = utaa.create_running_workflow(
-        workflow_id=wfid, project_id="project-00000000-0000-0000-0000-000000000001"
+        workflow_id=wfid, project_id=TEST_PROJECT_ID
     )
     rwfid = response["id"]
 
@@ -108,7 +109,7 @@ def test_set_running_workflow_done_when_success():
     response = utaa.create_workflow(workflow_definition={"name": "blah"})
     response = utaa.create_running_workflow(
         workflow_id=response["id"],
-        project_id="project-00000000-0000-0000-0000-000000000001",
+        project_id=TEST_PROJECT_ID,
     )
     rwfid = response["id"]
 
@@ -127,7 +128,7 @@ def test_set_running_workflow_done_when_failed():
     response = utaa.create_workflow(workflow_definition={"name": "blah"})
     response = utaa.create_running_workflow(
         workflow_id=response["id"],
-        project_id="project-00000000-0000-0000-0000-000000000001",
+        project_id=TEST_PROJECT_ID,
     )
     rwfid = response["id"]
 
@@ -146,7 +147,7 @@ def test_create_running_workflow_step():
     response = utaa.create_workflow(workflow_definition={"name": "blah"})
     response = utaa.create_running_workflow(
         workflow_id=response["id"],
-        project_id="project-00000000-0000-0000-0000-000000000001",
+        project_id=TEST_PROJECT_ID,
     )
 
     # Act
@@ -164,7 +165,7 @@ def test_get_running_workflow_step():
     response = utaa.create_workflow(workflow_definition={"name": "blah"})
     wfid = response["id"]
     response = utaa.create_running_workflow(
-        workflow_id=wfid, project_id="project-00000000-0000-0000-0000-000000000001"
+        workflow_id=wfid, project_id=TEST_PROJECT_ID
     )
     rwfid = response["id"]
     response = utaa.create_running_workflow_step(
@@ -188,7 +189,7 @@ def test_get_running_workflow_steps():
     response = utaa.create_workflow(workflow_definition={"name": "blah"})
     wfid = response["id"]
     response = utaa.create_running_workflow(
-        workflow_id=wfid, project_id="project-00000000-0000-0000-0000-000000000001"
+        workflow_id=wfid, project_id=TEST_PROJECT_ID
     )
     rwfid = response["id"]
     response = utaa.create_running_workflow_step(

tests/test_test_instance_launcher.py

@@ -5,6 +5,7 @@
 pytestmark = pytest.mark.unit
 
 from tests.api_adapter import UnitTestAPIAdapter
+from tests.config import TEST_PROJECT_ID
 from tests.instance_launcher import UnitTestInstanceLauncher
 from tests.message_dispatcher import UnitTestMessageDispatcher
 from tests.message_queue import UnitTestMessageQueue
@@ -21,14 +22,14 @@ def basic_launcher():
     return [api_adapter, instance_launcher]
 
 
-def test_get_nop_job(basic_launcher):
+def test_launch_nop(basic_launcher):
     # Arrange
     utaa = basic_launcher[0]
     launcher = basic_launcher[1]
     response = utaa.create_workflow(workflow_definition={"name": "blah"})
     response = utaa.create_running_workflow(
         workflow_id=response["id"],
-        project_id="project-00000000-0000-0000-0000-000000000001",
+        project_id=TEST_PROJECT_ID,
     )
     response = utaa.create_running_workflow_step(
         running_workflow_id=response["id"], step="step-1"
@@ -37,14 +38,75 @@ def test_get_nop_job(basic_launcher):
 
     # Act
     result = launcher.launch(
-        project_id="project-00000000-0000-0000-0000-000000000001",
+        project_id=TEST_PROJECT_ID,
         workflow_id="workflow-00000000-0000-0000-0000-000000000001",
         running_workflow_step_id=rwfsid,
         workflow_definition={},
-        step_specification={"job": "nop", "variables": {"x": 1}},
+        step_specification={"job": "nop"},
     )
 
     # Assert
     assert result.error == 0
     assert result.command.startswith("python ")
     assert result.command.endswith("tests/jobs/nop.py")
+
+
+def test_launch_nop_fail(basic_launcher):
+    # Arrange
+    utaa = basic_launcher[0]
+    launcher = basic_launcher[1]
+    response = utaa.create_workflow(workflow_definition={"name": "blah"})
+    response = utaa.create_running_workflow(
+        workflow_id=response["id"],
+        project_id=TEST_PROJECT_ID,
+    )
+    response = utaa.create_running_workflow_step(
+        running_workflow_id=response["id"], step="step-1"
+    )
+    rwfsid = response["id"]
+
+    # Act
+    result = launcher.launch(
+        project_id=TEST_PROJECT_ID,
+        workflow_id="workflow-00000000-0000-0000-0000-000000000001",
+        running_workflow_step_id=rwfsid,
+        workflow_definition={},
+        step_specification={"job": "nop-fail"},
+    )
+
+    # Assert
+    assert result.error == 0
+    assert result.command.startswith("python ")
+    assert result.command.endswith("tests/jobs/nop-fail.py")
+
+
+def test_launch_smiles_to_file(basic_launcher):
+    # Arrange
+    utaa = basic_launcher[0]
+    launcher = basic_launcher[1]
+    response = utaa.create_workflow(workflow_definition={"name": "blah"})
+    response = utaa.create_running_workflow(
+        workflow_id=response["id"],
+        project_id=TEST_PROJECT_ID,
+    )
+    response = utaa.create_running_workflow_step(
+        running_workflow_id=response["id"], step="step-1"
+    )
+    rwfsid = response["id"]
+
+    # Act
+    result = launcher.launch(
+        project_id=TEST_PROJECT_ID,
+        workflow_id="workflow-00000000-0000-0000-0000-000000000001",
+        running_workflow_step_id=rwfsid,
+        workflow_definition={},
+        step_specification={
+            "job": "smiles-to-file",
+            "variables": {"smiles": "C1=CC=CC=C1", "outputFile": "output.smi"},
+        },
+    )
+
+    # Assert
+    assert result.error == 0
+    assert result.command.startswith("python ")
+    assert result.command.endswith("tests/jobs/smiles-to-file.py")

tests/test_workflow_engine_examples.py

@@ -11,6 +11,7 @@
 from informaticsmatters.protobuf.datamanager.workflow_message_pb2 import WorkflowMessage
 
 from tests.api_adapter import UnitTestAPIAdapter
+from tests.config import TEST_PROJECT_ID
 from tests.instance_launcher import UnitTestInstanceLauncher
 from tests.message_dispatcher import UnitTestMessageDispatcher
 from tests.message_queue import UnitTestMessageQueue
@@ -71,9 +72,7 @@ def start_workflow(md, da, workflow_file_name) -> str:
     assert wfid
     print(f"Created workflow definition {wfid}")
     # 2.
-    response = da.create_running_workflow(
-        workflow_id=wfid, project_id="project-00000000-0000-0000-0000-000000000001"
-    )
+    response = da.create_running_workflow(workflow_id=wfid, project_id=TEST_PROJECT_ID)
     r_wfid = response["id"]
     assert r_wfid
     print(f"Created running workflow {r_wfid}")