Merge pull request #108 from lsst-ts/develop

v0.20.4 - fix script names

conda/meta.yaml

@@ -16,14 +16,17 @@ build:
     - auxtel_image_taking = lsst.ts.IntegrationTests.image_taking_verification:run_auxtel_image_taking
     - auxtel_latiss_acquire_and_take_sequence = lsst.ts.IntegrationTests.auxtel_latiss_acquire_and_take_sequence:run_auxtel_latiss_acquire_and_take_sequence
     - auxtel_latiss_calibrations = lsst.ts.IntegrationTests.auxtel_latiss_calibrations:run_auxtel_latiss_calibrations
-    - auxtel_latiss_cwfs_align = lsst.ts.IntegrationTests.auxtel_latiss_cwfs_align:run_auxtel_latiss_cwfs_align
+    - auxtel_latiss_checkout = lsst.ts.IntegrationTests.auxtel_latiss_checkout:run_auxtel_latiss_checkout
+    - auxtel_latiss_wep_align = lsst.ts.IntegrationTests.auxtel_latiss_wep_align:run_auxtel_latiss_wep_align
     - auxtel_offline_standby = lsst.ts.IntegrationTests.auxtel_offline_standby:run_auxtel_offline_standby
     - auxtel_prepare_for_flat = lsst.ts.IntegrationTests.auxtel_prepare_for_flat:run_auxtel_prepare_for_flat
     - auxtel_prepare_for_onsky = lsst.ts.IntegrationTests.auxtel_prepare_for_onsky:run_auxtel_prepare_for_onsky
     - auxtel_reset_offsets = lsst.ts.IntegrationTests.auxtel_reset_offsets:run_auxtel_reset_offsets
     - auxtel_shutdown = lsst.ts.IntegrationTests.auxtel_shutdown:run_auxtel_shutdown
+    - auxtel_slew_and_take_image_checkout = lsst.ts.IntegrationTests.auxtel_slew_and_take_image_checkout:run_auxtel_slew_and_take_image_checkout
     - auxtel_standby_disabled = lsst.ts.IntegrationTests.auxtel_standby_disabled:run_auxtel_standby_disabled
     - auxtel_stop = lsst.ts.IntegrationTests.auxtel_stop:run_auxtel_stop
+    - auxtel_telescope_dome_checkout = lsst.ts.IntegrationTests.auxtel_telescope_dome_checkout:run_auxtel_telescope_dome_checkout
     - auxtel_track_target = lsst.ts.IntegrationTests.auxtel_track_target:run_auxtel_track_target
     - auxtel_visit = lsst.ts.IntegrationTests.auxtel_visit:run_auxtel_visit
     - comcam_calibrations = lsst.ts.IntegrationTests.comcam_calibrations:run_comcam_calibrations

pyproject.toml

@@ -33,7 +33,7 @@ auxtel_prepare_for_flat = "lsst.ts.IntegrationTests.auxtel_prepare_for_flat:run_
 auxtel_prepare_for_onsky = "lsst.ts.IntegrationTests.auxtel_prepare_for_onsky:run_auxtel_prepare_for_onsky"
 auxtel_reset_offsets = "lsst.ts.IntegrationTests.auxtel_reset_offsets:run_auxtel_reset_offsets"
 auxtel_shutdown = "lsst.ts.IntegrationTests.auxtel_shutdown:run_auxtel_shutdown"
-auxtel_slew_take_image_checkout = "lsst.ts.IntegrationTests.auxtel_slew_and_take_image_checkout:run_auxtel_slew_take_image_checkout"
+auxtel_slew_and_take_image_checkout = "lsst.ts.IntegrationTests.auxtel_slew_and_take_image_checkout:run_auxtel_slew_and_take_image_checkout"
 auxtel_standby_disabled = "lsst.ts.IntegrationTests.auxtel_standby_disabled:run_auxtel_standby_disabled"
 auxtel_stop = "lsst.ts.IntegrationTests.auxtel_stop:run_auxtel_stop"
 auxtel_telescope_dome_checkout = "lsst.ts.IntegrationTests.auxtel_telescope_dome_checkout:run_auxtel_telescope_and_dome_checkout"

python/lsst/ts/IntegrationTests/auxtel_slew_and_take_image_checkout.py

@@ -20,14 +20,14 @@
 #
 # You should have received a copy of the GNU General Public License
 
-__all__ = ["SlewTakeImageCheckout", "run_auxtel_slew_take_image_checkout"]
+__all__ = ["SlewAndTakeImageCheckout", "run_auxtel_slew_and_take_image_checkout"]
 
 import asyncio
 
 from lsst.ts.IntegrationTests import BaseScript
 
 
-class SlewTakeImageCheckout(BaseScript):
+class SlewAndTakeImageCheckout(BaseScript):
     """Execute the given Standard or External script,
     with the given Yaml configuration,
     placed in the given ScriptQueue location.
@@ -46,8 +46,8 @@ def __init__(self) -> None:
         super().__init__()
 
 
-def run_auxtel_slew_take_image_checkout() -> None:
-    script_class = SlewTakeImageCheckout()
+def run_auxtel_slew_and_take_image_checkout() -> None:
+    script_class = SlewAndTakeImageCheckout()
     num_scripts = len(script_class.scripts)
     print(f"\nSlew and Take Image Daytime Checkout; running {num_scripts} scripts")
     asyncio.run(script_class.run())

tests/test_auxtel_slew_take_image_checkout.py

@@ -24,10 +24,10 @@
 import unittest
 
 from lsst.ts import salobj
-from lsst.ts.IntegrationTests import ScriptQueueController, SlewTakeImageCheckout
+from lsst.ts.IntegrationTests import ScriptQueueController, SlewAndTakeImageCheckout
 
 
-class SlewTakeImageCheckoutTestCase(unittest.IsolatedAsyncioTestCase):
+class SlewAndTakeImageCheckoutTestCase(unittest.IsolatedAsyncioTestCase):
     """Test the AuxTel Slew and Take Image Checkout integration test script."""
 
     async def asyncSetUp(self) -> None:
@@ -40,13 +40,13 @@ async def asyncSetUp(self) -> None:
         # Start the controller and wait for it be ready.
         await self.controller.start_task
 
-    async def test_auxtel_slew_take_image_checkout(self) -> None:
-        """Execute the SlewTakeImageCheckout integration test script,
+    async def test_auxtel_slew_and_take_image_checkout(self) -> None:
+        """Execute the SlewAndTakeImageCheckout integration test script,
         which runs the auxtel/daytime_checkout/telescope_and_dome_checkout.py
         in ts_standardscripts.
         """
-        # Instantiate the SlewTakeImageCheckout integration tests.
-        script_class = SlewTakeImageCheckout()
+        # Instantiate the SlewAndTakeImageCheckout integration tests.
+        script_class = SlewAndTakeImageCheckout()
         # Get number of scripts
         num_scripts = len(script_class.scripts)
         print(f"AuxTel Slew and Take Image Checkout; running {num_scripts} scripts")