diff --git a/doc/version-history.rst b/doc/version-history.rst index e6401e9c..4dec4426 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.30.0 +------- +* Allow scripts to be run with specific log levels. + v0.29.0 ------- * ESS index updates. diff --git a/python/lsst/ts/IntegrationTests/base_script.py b/python/lsst/ts/IntegrationTests/base_script.py index 97d14db7..85f5fed1 100644 --- a/python/lsst/ts/IntegrationTests/base_script.py +++ b/python/lsst/ts/IntegrationTests/base_script.py @@ -201,7 +201,7 @@ async def run(self) -> None: isStandard=script[1], path=script[0], config=config, - logLevel=10, + logLevel=self.log_level if hasattr(self, "log_level") else 10, location=queue_placement, ) try: diff --git a/python/lsst/ts/IntegrationTests/configs/image_taking_configs.py b/python/lsst/ts/IntegrationTests/configs/image_taking_configs.py index 776892ae..22ba354c 100644 --- a/python/lsst/ts/IntegrationTests/configs/image_taking_configs.py +++ b/python/lsst/ts/IntegrationTests/configs/image_taking_configs.py @@ -58,11 +58,6 @@ "script_mode": "BIAS_DARK_FLAT", "do_defects": True, "certify_calib_begin_date": "replace_me", - "config_options_bias": "-c biasIsr:doDefect=False", - "config_options_dark": "-c darkIsr:doDefect=False", - "config_options_flat": "-c flatIsr:doDefect=False", - "config_options_defects": "-c defectIsr:doDefect=False", - "config_options_ptc": "-c ptcIsr:doCrosstalk=False", }, explicit_start=True, canonical=True, @@ -127,11 +122,6 @@ "do_defects": True, "do_ptc": True, "certify_calib_begin_date": "replace_me", - "config_options_bias": "-c biasIsr:doDefect=False", - "config_options_dark": "-c darkIsr:doDefect=False", - "config_options_flat": "-c flatIsr:doDefect=False", - "config_options_defects": "-c defectIsr:doDefect=False", - "config_options_ptc": "-c ptcIsr:doCrosstalk=False", }, explicit_start=True, canonical=True, diff --git a/python/lsst/ts/IntegrationTests/love_stress_test.py b/python/lsst/ts/IntegrationTests/love_stress_test.py index f3e13d2d..ea3866c4 100644 --- a/python/lsst/ts/IntegrationTests/love_stress_test.py +++ b/python/lsst/ts/IntegrationTests/love_stress_test.py @@ -52,11 +52,12 @@ class LoveStressTest(BaseScript): ("make_love_stress_tests.py", BaseScript.is_external), ] - def __init__(self, test_env: str, k8s: bool = False) -> None: + def __init__(self, test_env: str, k8s: bool = False, log_level: int = 20) -> None: super().__init__() # Set the LOVE location based on test environment self.test_env = test_env self.k8s = k8s + self.log_level = log_level self.env_configs = yaml.safe_load(registry["love_stress"]) if test_env.lower() == "summit": # Running on Summit diff --git a/tests/test_love_stress.py b/tests/test_love_stress.py index 101ff5e6..626895b2 100644 --- a/tests/test_love_stress.py +++ b/tests/test_love_stress.py @@ -65,6 +65,8 @@ async def test_love_stress(self) -> None: self.assertEqual(script_class.script_states, [8]) # Assert location is correct. self.assertEqual(script_config["location"], "http://love01.ls.lsst.org") + # Assert script is run in INFO mode. + self.assertEqual(script_class.log_level, 20) async def test_love_stress_on_k8s(self) -> None: """Execute the LoveStress integration test script on the kubernetes @@ -91,6 +93,8 @@ async def test_love_stress_on_k8s(self) -> None: self.assertEqual(script_class.script_states, [8]) # Assert location is correct. self.assertEqual(script_config["location"], "https://base-lsp.lsst.codes/love") + # Assert script is run in INFO mode. + self.assertEqual(script_class.log_level, 20) async def asyncTearDown(self) -> None: await self.controller.close()