Skip to content

Commit

Permalink
Merge pull request #130 from lsst-ts/tickets/DM-44155
Browse files Browse the repository at this point in the history
Tickets/dm44155: Fixed empty-config definition
  • Loading branch information
rbovill authored Sep 23, 2024
2 parents f7b7bfe + 31a1afe commit a20f368
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions doc/version-history.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ v0.28.0
-------
* Removed MainTel Camera state transition scripts and configs.
* Add MTRotator to ignore list in enabled_offline_state_transition_configs.py.
* Moved the callback definition in base_script.py.
* Fixed an empty-config definition.

v0.27.0
-------
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ts/IntegrationTests/auxtel_housekeeping.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class AuxTelHousekeeping(BaseScript):

index: int = 2
configs: tuple = (
[],
"",
registry["atdome_home"],
registry["atdome_park"],
registry["atptg_park"],
Expand Down
6 changes: 3 additions & 3 deletions python/lsst/ts/IntegrationTests/base_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,6 @@ async def run(self) -> None:
# Since `async with` is used,
# you do NOT have to wait for the remote to start

# Create the callback to the ScriptQueue Script Event that
# will wait for all the scripts to complete.
self.remote.evt_script.callback = self.wait_for_done
# Convert the queue_placement parameter to the approprirate
# ScriptQueue.Location Enum object.
queue_placement = getattr(Location, self.queue_placement.upper())
Expand All @@ -213,6 +210,9 @@ async def run(self) -> None:
# Copy the script_indexes list to use in the Script Event callback.
# This maintains the integrity of the real script_indexes list.
self.temp_script_indexes = copy.deepcopy(script_indexes)
# Create the callback to the ScriptQueue Script Event that
# will wait for all the scripts to complete.
self.remote.evt_script.callback = self.wait_for_done
# Resume the ScriptQueue to begin script execution.
await self.remote.cmd_resume.set_start(timeout=10)
# Wait for the scripts to complete.
Expand Down

0 comments on commit a20f368

Please sign in to comment.