From cc51aefb57125f17b56003dbc45007aa8eba3f5d Mon Sep 17 00:00:00 2001 From: gac-x01da Date: Fri, 13 Sep 2024 12:52:13 +0200 Subject: [PATCH] fix: cleanup test --- tests/tests_scans/test_mono_bragg_scans.py | 74 +++++++++++++--------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/tests/tests_scans/test_mono_bragg_scans.py b/tests/tests_scans/test_mono_bragg_scans.py index bcba4f5..eb86b3e 100644 --- a/tests/tests_scans/test_mono_bragg_scans.py +++ b/tests/tests_scans/test_mono_bragg_scans.py @@ -336,6 +336,8 @@ def test_xas_advanced_scan(): continue if "RID" in cmd.metadata: cmd.metadata["RID"] = "my_test_request_id" + if "DIID" in cmd.metadata: + cmd.metadata.pop("DIID") if "rpc_id" in cmd.parameter: cmd.parameter["rpc_id"] = "my_test_rpc_id" @@ -343,13 +345,13 @@ def test_xas_advanced_scan(): None, None, DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 0, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="scan_report_instruction", parameter={"device_progress": ["mo1_bragg"]}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 1, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="open_scan", parameter={ @@ -367,13 +369,13 @@ def test_xas_advanced_scan(): }, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 2, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="stage", parameter={}, ), DeviceInstructionMessage( - metadata={"readout_priority": "baseline", "DIID": 3, "RID": "my_test_request_id"}, + metadata={"readout_priority": "baseline", "RID": "my_test_request_id"}, device=None, action="baseline_reading", parameter={}, @@ -381,7 +383,6 @@ def test_xas_advanced_scan(): DeviceInstructionMessage( metadata={ "readout_priority": "monitored", - "DIID": 4, "RID": "my_test_request_id", "response": True, }, @@ -396,61 +397,67 @@ def test_xas_advanced_scan(): }, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 5, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device="mo1_bragg", action="kickoff", parameter={"configure": {}, "wait_group": "kickoff"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 6, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, + device="mo1_bragg", + action="wait", + parameter={"type": "move", "wait_group": "kickoff"}, + ), + DeviceInstructionMessage( + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device="mo1_bragg", action="complete", parameter={}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 7, "RID": "my_test_request_id", "point_id": 0}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 0}, device=None, action="read", parameter={"group": "primary", "wait_group": "readout_primary"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 8, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 9, "RID": "my_test_request_id", "point_id": 1}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 1}, device=None, action="read", parameter={"group": "primary", "wait_group": "readout_primary"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 10, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 11, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 12, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="complete", parameter={}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 13, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="unstage", parameter={}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 14, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="close_scan", parameter={}, @@ -491,6 +498,8 @@ def test_xas_advanced_scan_with_xrd(): continue if "RID" in cmd.metadata: cmd.metadata["RID"] = "my_test_request_id" + if "DIID" in cmd.metadata: + cmd.metadata.pop("DIID") if "rpc_id" in cmd.parameter: cmd.parameter["rpc_id"] = "my_test_rpc_id" @@ -498,13 +507,13 @@ def test_xas_advanced_scan_with_xrd(): None, None, DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 0, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="scan_report_instruction", parameter={"device_progress": ["mo1_bragg"]}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 1, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="open_scan", parameter={ @@ -522,13 +531,13 @@ def test_xas_advanced_scan_with_xrd(): }, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 2, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="stage", parameter={}, ), DeviceInstructionMessage( - metadata={"readout_priority": "baseline", "DIID": 3, "RID": "my_test_request_id"}, + metadata={"readout_priority": "baseline", "RID": "my_test_request_id"}, device=None, action="baseline_reading", parameter={}, @@ -536,7 +545,6 @@ def test_xas_advanced_scan_with_xrd(): DeviceInstructionMessage( metadata={ "readout_priority": "monitored", - "DIID": 4, "RID": "my_test_request_id", "response": True, }, @@ -551,61 +559,67 @@ def test_xas_advanced_scan_with_xrd(): }, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 5, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device="mo1_bragg", action="kickoff", parameter={"configure": {}, "wait_group": "kickoff"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 6, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, + device="mo1_bragg", + action="wait", + parameter={"type": "move", "wait_group": "kickoff"}, + ), + DeviceInstructionMessage( + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device="mo1_bragg", action="complete", parameter={}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 7, "RID": "my_test_request_id", "point_id": 0}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 0}, device=None, action="read", parameter={"group": "primary", "wait_group": "readout_primary"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 8, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 9, "RID": "my_test_request_id", "point_id": 1}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 1}, device=None, action="read", parameter={"group": "primary", "wait_group": "readout_primary"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 10, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 11, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 12, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="complete", parameter={}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 13, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="unstage", parameter={}, ), DeviceInstructionMessage( - metadata={"readout_priority": "monitored", "DIID": 14, "RID": "my_test_request_id"}, + metadata={"readout_priority": "monitored", "RID": "my_test_request_id"}, device=None, action="close_scan", parameter={},