Fixup sample id

DiamondLightSource · Feb 5, 2025 · ce0fcf1 · ce0fcf1
1 parent 9052a91
commit ce0fcf1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/tests/system_tests/hyperion/external_interaction/test_ispyb_dev_connection.py b/tests/system_tests/hyperion/external_interaction/test_ispyb_dev_connection.py
@@ -197,6 +197,7 @@ def params_for_rotation_scan(test_rotation_params: RotationScan):
     test_rotation_params.exposure_time_s = 0.023
     test_rotation_params.detector_params.expected_energy_ev = 0.71
     test_rotation_params.visit = os.environ.get("ST_VISIT", "cm31105-4")
+    test_rotation_params.sample_id = os.environ.get("ST_SAMPLE_ID", 123456)
     return test_rotation_params
 
 
@@ -491,15 +492,14 @@ def test_ispyb_deposition_in_rotation_plan(
         fetch_comment(dcid) == "Sample position (µm): (1, 2, 3) test  Aperture: Small. "
     )
 
-    visit = params_for_rotation_scan.visit
     expected_values = EXPECTED_DATACOLLECTION_FOR_ROTATION | {
-        "xtalSnapshotFullPath1": f"regex:/tmp/dls/i03/data/2024/{visit}/auto/123456/snapshots/\\d{6}_oav_snapshot_0"
+        "xtalSnapshotFullPath1": "regex:/tmp/dls/i03/data/2024/cm-31105/auto/123456/snapshots/\\d{6}_oav_snapshot_0"
         ".png",
-        "xtalSnapshotFullPath2": f"regex:/tmp/dls/i03/data/2024/{visit}/auto/123456/snapshots/\\d{6}_oav_snapshot_90"
+        "xtalSnapshotFullPath2": "regex:/tmp/dls/i03/data/2024/cm-31105/auto/123456/snapshots/\\d{6}_oav_snapshot_90"
         ".png",
-        "xtalSnapshotFullPath3": f"regex:/tmp/dls/i03/data/2024/{visit}/auto/123456/snapshots/\\d{6}_oav_snapshot_180"
+        "xtalSnapshotFullPath3": "regex:/tmp/dls/i03/data/2024/cm-31105/auto/123456/snapshots/\\d{6}_oav_snapshot_180"
         ".png",
-        "xtalSnapshotFullPath4": f"regex:/tmp/dls/i03/data/2024/{visit}/auto/123456/snapshots/\\d{6}_oav_snapshot_270"
+        "xtalSnapshotFullPath4": "regex:/tmp/dls/i03/data/2024/cm-31105/auto/123456/snapshots/\\d{6}_oav_snapshot_270"
         ".png",
     }