Update tests

Author: stephen-riggs

tests/client/contexts/test_atlas.py

@@ -23,7 +23,7 @@ def test_atlas_context_mrc(mock_capture_post, tmp_path):
         default_destinations={
             tmp_path / "cm12345-6": f"{tmp_path}/destination/cm12345-6"
         },
-        instrument_name="",
+        instrument_name="m01",
         visit="cm12345-6",
         murfey_session=1,
     )
@@ -42,6 +42,7 @@ def test_atlas_context_mrc(mock_capture_post, tmp_path):
         router_name="session_control.spa_router",
         function_name="make_atlas_jpg",
         token="token",
+        instrument_name="m01",
         session_id=1,
         data={"path": f"{tmp_path}/destination/{atlas_mrc.relative_to(tmp_path)}"},
     )
@@ -56,7 +57,7 @@ def test_atlas_context_xml(mock_capture_post, tmp_path):
         default_destinations={
             tmp_path / "cm12345-6": f"{tmp_path}/destination/cm12345-6"
         },
-        instrument_name="",
+        instrument_name="m01",
         visit="cm12345-6",
         murfey_session=1,
     )
@@ -87,6 +88,7 @@ def test_atlas_context_xml(mock_capture_post, tmp_path):
         router_name="workflow.router",
         function_name="register_dc_group",
         token="token",
+        instrument_name="m01",
         visit_name="cm12345-6",
         session_id=1,
         data=dcg_data,

tests/client/test_context.py

@@ -15,7 +15,7 @@ def test_ensure_dcg_exists_tomo(mock_capture_post, tmp_path):
             tmp_path
             / "cm12345-6/metadata_folder": f"{tmp_path}/destination/cm12345-6/raw"
         },
-        instrument_name="",
+        instrument_name="m01",
         visit="cm12345-6",
         murfey_session=1,
     )
@@ -57,6 +57,7 @@ def test_ensure_dcg_exists_tomo(mock_capture_post, tmp_path):
         router_name="workflow.router",
         function_name="register_dc_group",
         token="token",
+        instrument_name="m01",
         visit_name="cm12345-6",
         session_id=1,
         data=dcg_data,
@@ -73,7 +74,7 @@ def test_ensure_dcg_exists_spa(mock_capture_post, tmp_path):
             tmp_path
             / "cm12345-6/metadata_folder": f"{tmp_path}/destination/cm12345-6/raw",
         },
-        instrument_name="",
+        instrument_name="m01",
         visit="cm12345-6",
         murfey_session=1,
     )
@@ -118,6 +119,7 @@ def test_ensure_dcg_exists_spa(mock_capture_post, tmp_path):
         router_name="workflow.router",
         function_name="register_dc_group",
         token="token",
+        instrument_name="m01",
         visit_name="cm12345-6",
         session_id=1,
         data=dcg_data,
@@ -131,7 +133,7 @@ def test_ensure_dcg_exists_spa_missing_xml(mock_capture_post, tmp_path):
         client_id=0,
         sources=[tmp_path],
         default_destinations={tmp_path: str(tmp_path)},
-        instrument_name="",
+        instrument_name="m01",
         visit="cm12345-6",
         murfey_session=1,
     )
@@ -154,6 +156,7 @@ def test_ensure_dcg_exists_spa_missing_xml(mock_capture_post, tmp_path):
         router_name="workflow.router",
         function_name="register_dc_group",
         token="token",
+        instrument_name="m01",
         visit_name="cm12345-6",
         session_id=1,
         data=dcg_data,

tests/client/test_destinations.py

@@ -112,6 +112,7 @@ def test_determine_default_destinations_suggested_path(mock_post, mock_get, sour
         router_name="file_io_instrument.router",
         function_name="suggest_path",
         token="token",
+        instrument_name="m01",
         visit_name="cm12345-6",
         session_id=2,
         data={
@@ -162,6 +163,7 @@ def test_determine_default_destinations_short_path(mock_post, mock_get):
         router_name="file_io_instrument.router",
         function_name="suggest_path",
         token="token",
+        instrument_name="m01",
         visit_name="cm12345-6",
         session_id=2,
         data={

tests/instrument_server/test_init.py

@@ -13,7 +13,7 @@
 
 import murfey
 from murfey.client.update import UPDATE_SUCCESS
-from murfey.instrument_server import check_for_updates, start_instrument_server
+from murfey.instrument_server import check_for_updates, run
 from murfey.server.api.bootstrap import pypi as pypi_router, version as version_router
 from murfey.util.api import url_path_for
 from murfey.util.logging import HTTPSHandler
@@ -186,7 +186,7 @@ def test_start_instrument_server(
         sys.argv.extend(["--port", str(port)])
 
     # Run the function
-    start_instrument_server()
+    run()
 
     # Check that the server was called with the correct arguments
     args, kwargs = mock_server.call_args