From 6b586dab26a1235fb5ec796b8379ffac9ce722be Mon Sep 17 00:00:00 2001 From: Synchon Mandal Date: Tue, 19 Mar 2024 12:29:07 +0100 Subject: [PATCH 1/4] fix: let htcondor parse element in HTCondorAdapter --- junifer/api/queue_context/htcondor_adapter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/junifer/api/queue_context/htcondor_adapter.py b/junifer/api/queue_context/htcondor_adapter.py index 96d590dae..0a16866e3 100644 --- a/junifer/api/queue_context/htcondor_adapter.py +++ b/junifer/api/queue_context/htcondor_adapter.py @@ -274,8 +274,8 @@ class HTCondorAdapter(QueueContextAdapter): ) fixed += ( f"JOB run{idx} {self._submit_run_path}\n" - f"VARS run{idx} element='{str_element}' " - f"log_element='{log_element}'\n\n" + f'VARS run{idx} element="{str_element}" ' + f'log_element="{log_element}"\n\n' ) var = "" if self._collect == "yes": -- 2.52.0 From 7a884983363fbf22913a5340abc300eefe8a59e2 Mon Sep 17 00:00:00 2001 From: Synchon Mandal Date: Tue, 19 Mar 2024 13:23:50 +0100 Subject: [PATCH 2/4] chore: improve commentary in HTCondorAdapter --- junifer/api/queue_context/htcondor_adapter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/junifer/api/queue_context/htcondor_adapter.py b/junifer/api/queue_context/htcondor_adapter.py index 0a16866e3..63899e13f 100644 --- a/junifer/api/queue_context/htcondor_adapter.py +++ b/junifer/api/queue_context/htcondor_adapter.py @@ -274,8 +274,8 @@ class HTCondorAdapter(QueueContextAdapter): ) fixed += ( f"JOB run{idx} {self._submit_run_path}\n" - f'VARS run{idx} element="{str_element}" ' - f'log_element="{log_element}"\n\n' + f'VARS run{idx} element="{str_element}" ' # needs to be + f'log_element="{log_element}"\n\n' # double quoted ) var = "" if self._collect == "yes": -- 2.52.0 From 5b2709750f4f9dc05ed5ad384d5696b3a2ce43bb Mon Sep 17 00:00:00 2001 From: Synchon Mandal Date: Tue, 19 Mar 2024 13:28:29 +0100 Subject: [PATCH 3/4] chore: add changelog 312.bugfix --- docs/changes/newsfragments/312.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/changes/newsfragments/312.bugfix diff --git a/docs/changes/newsfragments/312.bugfix b/docs/changes/newsfragments/312.bugfix new file mode 100644 index 000000000..a43ff95a1 --- /dev/null +++ b/docs/changes/newsfragments/312.bugfix @@ -0,0 +1 @@ +Fix :class:`.HTCondorAdapter`'s script generation to use double quotes instead of single quotes for HTCondor's ``VARS`` by `Synchon Mandal`_ -- 2.52.0 From dc704ac2678281c7749461a2695d0766763ac48a Mon Sep 17 00:00:00 2001 From: Synchon Mandal Date: Tue, 19 Mar 2024 13:50:54 +0100 Subject: [PATCH 4/4] fix: update tests for HTCondorAdapter --- junifer/api/queue_context/tests/test_htcondor_adapter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/junifer/api/queue_context/tests/test_htcondor_adapter.py b/junifer/api/queue_context/tests/test_htcondor_adapter.py index f0c048d6d..cf41e6d9e 100644 --- a/junifer/api/queue_context/tests/test_htcondor_adapter.py +++ b/junifer/api/queue_context/tests/test_htcondor_adapter.py @@ -139,13 +139,13 @@ def test_HTCondorAdapter_run_collect( ( [("sub01", "ses01")], "yes", - "element='sub01,ses01' log_element='sub01-ses01'", + 'element="sub01,ses01" log_element="sub01-ses01"', ), (["sub01"], "on_success_only", "JOB collect"), ( [("sub01", "ses01")], "on_success_only", - "element='sub01,ses01' log_element='sub01-ses01'", + 'element="sub01,ses01" log_element="sub01-ses01"', ), ], ) -- 2.52.0