Merge pull request #92 from lsst-ts/watcher_last

watcher_last: Swapped the order of the Watcher and the OCPS:2||3 in the obssys_state_transition_configs
lsst-ts · Dec 8, 2023 · 1d6e42f · 1d6e42f
2 parents 7ec5ad0 + 4015dc0
commit 1d6e42f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/doc/version-history.rst b/doc/version-history.rst
@@ -10,6 +10,10 @@ Version History
 .. No new work should be required in order to complete this section.
 .. Below is an example of a version history format.
 
+v0.17.2
+-------
+* Swapped the order of the Watcher and the OCPS:2||3 in the obssys_state_transition_configs.
+
 v0.17.1
 -------
 * Updated the latiss_acquire_and_take_sequence 'test' and 'nominal' configs with Cycle34 changes.

diff --git a/python/lsst/ts/IntegrationTests/configs/obssys_state_transition_configs.py b/python/lsst/ts/IntegrationTests/configs/obssys_state_transition_configs.py
@@ -34,8 +34,8 @@
     - [Scheduler:1, DISABLED]
     - [Scheduler:2, DISABLED]
     - [OCPS:1, DISABLED]
-    - [replace_me, DISABLED]
     - [Watcher, DISABLED]
+    - [replace_me, DISABLED]
     """
 )
 
@@ -50,8 +50,8 @@
     - [Scheduler:1, ENABLED]
     - [Scheduler:2, ENABLED]
     - [OCPS:1, ENABLED]
-    - [replace_me, ENABLED]
     - [Watcher, ENABLED]
+    - [replace_me, ENABLED]
     """
 )
 

diff --git a/python/lsst/ts/IntegrationTests/obssys_disabled_enabled.py b/python/lsst/ts/IntegrationTests/obssys_disabled_enabled.py
@@ -55,7 +55,7 @@ def __init__(self, test_env: str) -> None:
         else:
             # Running on TTS or Summit with OCPS:2
             self.ocps = "OCPS:2"
-        self.env_configs["data"][3][0] = self.ocps
+        self.env_configs["data"][-1][0] = self.ocps
         self.configs = (yaml.safe_dump(self.env_configs),)
 
 

diff --git a/python/lsst/ts/IntegrationTests/obssys_standby_disabled.py b/python/lsst/ts/IntegrationTests/obssys_standby_disabled.py
@@ -55,7 +55,7 @@ def __init__(self, test_env: str) -> None:
         else:
             # Running on TTS or Summit with OCPS:2
             self.ocps = "OCPS:2"
-        self.env_configs["data"][3][0] = self.ocps
+        self.env_configs["data"][-1][0] = self.ocps
         self.configs = (yaml.safe_dump(self.env_configs),)
 
 

diff --git a/tests/test_obssys_state_transitions.py b/tests/test_obssys_state_transitions.py
@@ -69,7 +69,7 @@ async def test_obssys_standby_disabled(self) -> None:
         # Assert scripts passed.
         self.assertEqual(script_class.script_states, [8])
         # Assert OCPS index was set correctly.
-        self.assertEqual(script_config["data"][3][0], "OCPS:2")
+        self.assertEqual(script_config["data"][-1][0], "OCPS:2")
 
     async def test_obssys_disabled_enabled(self) -> None:
         """Execute the ObsSysDisabledEnabled integration test script,
@@ -95,7 +95,7 @@ async def test_obssys_disabled_enabled(self) -> None:
         # Assert scripts passed.
         self.assertEqual(script_class.script_states, [8])
         # Assert OCPS index was set correctly.
-        self.assertEqual(script_config["data"][3][0], "OCPS:3")
+        self.assertEqual(script_config["data"][-1][0], "OCPS:3")
 
     async def asyncTearDown(self) -> None:
         await self.controller.close()