From 33516f6fbb4b57cb990917d2a4f7a245100dc876 Mon Sep 17 00:00:00 2001 From: David Sanmartim Date: Thu, 25 Jul 2024 15:46:58 -0400 Subject: [PATCH] Small fixes --- .../externalscripts/maintel/take_ptc_flats_comcam.py | 2 +- tests/maintel/test_take_ptc_flats_comcam.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/python/lsst/ts/externalscripts/maintel/take_ptc_flats_comcam.py b/python/lsst/ts/externalscripts/maintel/take_ptc_flats_comcam.py index 7bcb776aa..c7bfc777a 100644 --- a/python/lsst/ts/externalscripts/maintel/take_ptc_flats_comcam.py +++ b/python/lsst/ts/externalscripts/maintel/take_ptc_flats_comcam.py @@ -22,7 +22,7 @@ import yaml from lsst.ts.observatory.control.maintel.comcam import ComCam, ComCamUsages -from base_take_ptc_flats import BaseTakePTCFlats +from ..base_take_ptc_flats import BaseTakePTCFlats class TakePTCFlatsComCam(BaseTakePTCFlats): diff --git a/tests/maintel/test_take_ptc_flats_comcam.py b/tests/maintel/test_take_ptc_flats_comcam.py index 35ba8f4cd..856b830ae 100644 --- a/tests/maintel/test_take_ptc_flats_comcam.py +++ b/tests/maintel/test_take_ptc_flats_comcam.py @@ -2,17 +2,18 @@ import unittest.mock as mock import pytest -from lsst.ts import salobj, externalscripts -from lsst.ts.externalscripts.take_ptc_flats_comcam import TakePTCFlatsComCam +from lsst.ts import salobj, externalscripts, standardscripts +from lsst.ts.externalscripts.maintel.take_ptc_flats_comcam import TakePTCFlatsComCam class TestTakePTCFlatsComCam( - externalscripts.BaseScriptTestCase, unittest.IsolatedAsyncioTestCase + standardscripts.BaseScriptTestCase, unittest.IsolatedAsyncioTestCase ): async def basic_make_script(self, index): self.script = TakePTCFlatsComCam(index=index) self.mock_camera() self.mock_electrometer() + return (self.script,) def mock_camera(self): @@ -35,6 +36,7 @@ def mock_electrometer(self): async def test_configure(self): config = { + "filter": "r_03", "flats_exp_times": [7.25, 7.25], "electrometer_scan": { "index": 1, @@ -61,6 +63,7 @@ async def test_configure(self): async def test_invalid_configuration(self): bad_config = { + "filter": "r_03", "flats_exp_times": [7.25, 7.25, 8.0], "electrometer_scan": { "index": 1, @@ -76,6 +79,7 @@ async def test_invalid_configuration(self): async def test_take_ptc_flats(self): config = { + "filter": "r_03", "flats_exp_times": [7.25, 7.25], "electrometer_scan": { "index": 1,