In test_cp_verify_alarm.py, publich the mock OCPS event.

lsst-ts · Jan 13, 2023 · e8a4e88 · e8a4e88
1 parent c88bb70
commit e8a4e88
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/tests/rules/test_cp_verify_alarm.py b/tests/rules/test_cp_verify_alarm.py
@@ -98,11 +98,9 @@ async def test_call(self):
         # use mock OCPS response and verify data below to test
         # self.check_response(response, verify_stats) in the alarm
 
-        async with salobj.Controller(
-            name="ScriptQueue", index=ocps_index
-        ) as script_queue:
+        async with salobj.Controller(name="OCPS", index=ocps_index) as ocps:
             async with watcher.Model(
-                domain=script_queue.domain, config=watcher_config
+                domain=ocps.domain, config=watcher_config
             ) as model:
                 model.enable()
 
@@ -112,17 +110,10 @@ async def test_call(self):
                 rule.alarm.init_severity_queue()
 
                 for test_params in self.get_test_params():
+                    response_verify = await self.mock_latiss_ocps_response()
 
-                    await script_queue.evt_queue.set_write(
-                        enabled=test_params.queue_enabled,
-                        running=test_params.queue_running,
-                        currentSalIndex=test_params.script_sal_index,
-                    )
-
-                    await script_queue.evt_script.set_write(
-                        scriptSalIndex=test_params.script_sal_index,
-                        processState=test_params.process_state,
-                        scriptState=test_params.script_state,
+                    await ocps.evt_job_result.set_write(
+                        result=response_verify,
                     )
 
                     # This will publish 2 alarm states for each set of test