From 3a8ee419643ae555b7ba1e8c5c4cf1bc7e13ed2b Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Fri, 6 May 2022 16:37:47 +0200 Subject: [PATCH] Fix HTCondor unittests --- docs/source/changelog.rst | 1 + tests/adapters_t/sites_t/test_htcondorsiteadapter.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index d1d172d3..633e5324 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -106,3 +106,4 @@ Fixed * Improved logging of the `HTCondor` batch system adapter and the status changes of the drones * Fix the handling of the termination of vanished resources * Fix state transitions for jobs retried by HTCondor +* Fix state transitions and refactoring of the SLURM site adapter diff --git a/tests/adapters_t/sites_t/test_htcondorsiteadapter.py b/tests/adapters_t/sites_t/test_htcondorsiteadapter.py index 6e2bd73c..2d72fbd8 100644 --- a/tests/adapters_t/sites_t/test_htcondorsiteadapter.py +++ b/tests/adapters_t/sites_t/test_htcondorsiteadapter.py @@ -86,7 +86,8 @@ request_memory=32768 request_disk=167772160 -queue 1""" # noqa: B950 +queue 1 +""" # noqa: B950 CONDOR_SUBMIT_JDL_SPARK_OBS = """executable = start_pilot.sh transfer_input_files = setup_pilot.sh @@ -263,7 +264,7 @@ def test_deploy_resource_htcondor_obs(self): kwargs["stdin_input"], CONDOR_SUBMIT_PER_ARGUMENTS_JDL_CONDOR_OBS, ) - self.mock_executor.reset() + self.mock_executor.reset_mock() def test_translate_resources_raises_logs(self): self.adapter = HTCondorAdapter(