From c974e964c806a37db348ca2fc5893229f6d59d52 Mon Sep 17 00:00:00 2001 From: Rob Bovill Date: Fri, 8 Dec 2023 12:03:42 -0700 Subject: [PATCH 1/3] Swapped the order of the Watcher and the OCPS:2||3 in the obssys_state_transition_configs.py. Updated the config index in the obssys_standby_disabled.py and obssys_disabled_enabled.py scripts. --- .../configs/obssys_state_transition_configs.py | 4 ++-- python/lsst/ts/IntegrationTests/obssys_disabled_enabled.py | 2 +- python/lsst/ts/IntegrationTests/obssys_standby_disabled.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/lsst/ts/IntegrationTests/configs/obssys_state_transition_configs.py b/python/lsst/ts/IntegrationTests/configs/obssys_state_transition_configs.py index cc88aa74..b6e48dc2 100644 --- 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 index d7212ae2..c72d24ed 100644 --- 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 index fae1e077..7ebbc72c 100644 --- 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),) From 8b900f8c26cf9b43636dd526aa67bcea386bc7d5 Mon Sep 17 00:00:00 2001 From: Rob Bovill Date: Fri, 8 Dec 2023 12:17:49 -0700 Subject: [PATCH 2/3] Updated unit tests. --- tests/test_obssys_state_transitions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_obssys_state_transitions.py b/tests/test_obssys_state_transitions.py index d789049a..1b2c7b0d 100644 --- 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() From 4015dc06ef90ac39687d3b7ed565436dc2801e6e Mon Sep 17 00:00:00 2001 From: Rob Bovill Date: Fri, 8 Dec 2023 12:04:58 -0700 Subject: [PATCH 3/3] Updated version-history. --- doc/version-history.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/version-history.rst b/doc/version-history.rst index d5710fb9..7cd8fef0 100644 --- 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.