Split the ComCam/LSSTCam image_taking_verification unit tests into tw…

…o separate scripts.
lsst-ts · Dec 14, 2023 · bbfb5cc · bbfb5cc
1 parent bbbdff2
commit bbfb5cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/tests/test_comcam_image_taking_verification.py b/tests/test_comcam_image_taking_verification.py
@@ -42,27 +42,7 @@ async def asyncSetUp(self) -> None:
         # Start the controller and wait for it be ready.
         await self.controller.start_task
 
-    async def test_comcam_image_taking_bts(self) -> None:
-        """Execute the ComCamImageTaking integration test script,
-        which runs the ts_standardscripts/take_image_comcam.py script.
-        Use the configuration stored in the image_taking_configs.py module.
-        """
-        # Instantiate the ComCamImageTaking integration tests.
-        script_class = ComCamImageTaking(test_env="bts")
-        # Get number of scripts
-        num_scripts = len(script_class.scripts)
-        print(
-            f"ComCam Image Taking verification. "
-            f"Running the {script_class.scripts[0][0]} script."
-        )
-        # Execute the scripts.
-        await script_class.run()
-        # Assert script was added to ScriptQueue.
-        self.assertEqual(len(self.controller.queue_list), num_scripts)
-        # Assert scripts passed.
-        self.assertEqual(script_class.script_states, [8])
-
-    async def test_comcam_image_taking_tts(self) -> None:
+    async def test_comcam_image_taking(self) -> None:
         """Execute the ComCamImageTaking integration test script,
         which runs the ts_standardscripts/take_image_comcam.py script.
         Use the configuration stored in the image_taking_configs.py module.

diff --git a/tests/test_lsstcam_image_taking_verification.py b/tests/test_lsstcam_image_taking_verification.py
@@ -24,7 +24,7 @@
 import unittest
 
 from lsst.ts import salobj
-from lsst.ts.IntegrationTests import LsstCamImageTaking, ScriptQueueController
+from lsst.ts.IntegrationTests import LSSTCamImageTaking, ScriptQueueController
 
 
 class RunImageTakingVerificationTestCase(unittest.IsolatedAsyncioTestCase):
@@ -43,12 +43,12 @@ async def asyncSetUp(self) -> None:
         await self.controller.start_task
 
     async def test_lsstcam_image_taking(self) -> None:
-        """Execute the LsstCamImageTaking integration test script,
+        """Execute the LSSTCamImageTaking integration test script,
         which runs the ts_standardscripts/take_image_lsstcam.py script.
         Use the configuration stored in the image_taking_configs.py module.
         """
         # Instantiate the LSSTCamImageTaking integration tests.
-        script_class = LsstCamImageTaking()
+        script_class = LSSTCamImageTaking(test_env="bts")
         # Get number of scripts
         num_scripts = len(script_class.scripts)
         print(