juaml/junifer
Watch
3
0
Fork
You've already forked junifer
 0
Code Issues 14 Pull requests 2 Packages Activity Actions

[FIX]: Element parsing for HTCondor via VARS #312

Merged
synchon merged 4 commits from fix/condor-element-parse into main 2024-03-19 13:23:47 +00:00
Conversation 3 Commits 4 Files changed 3 +5 -4
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changes/newsfragments/312.bugfix Normal file
View file

@ -0,0 +1 @@
Fix :class:`.HTCondorAdapter`'s script generation to use double quotes instead of single quotes for HTCondor's ``VARS`` by `Synchon Mandal`_

4
junifer/api/queue_context/htcondor_adapter.py
View file

@ -274,8 +274,8 @@ class HTCondorAdapter(QueueContextAdapter):
) )
fixed += ( fixed += (
f"JOB run{idx} {self._submit_run_path}\n" f"JOB run{idx} {self._submit_run_path}\n"
f"VARS run{idx} element='{str_element}' " f'VARS run{idx} element="{str_element}" ' # needs to be
f"log_element='{log_element}'\n\n" f'log_element="{log_element}"\n\n' # double quoted
) )
var = "" var = ""
if self._collect == "yes": if self._collect == "yes":

4
junifer/api/queue_context/tests/test_htcondor_adapter.py
View file

@ -139,13 +139,13 @@ def test_HTCondorAdapter_run_collect(
( (
[("sub01", "ses01")], [("sub01", "ses01")],
"yes", "yes",
"element='sub01,ses01' log_element='sub01-ses01'", 'element="sub01,ses01" log_element="sub01-ses01"',
), ),
(["sub01"], "on_success_only", "JOB collect"), (["sub01"], "on_success_only", "JOB collect"),
( (
[("sub01", "ses01")], [("sub01", "ses01")],
"on_success_only", "on_success_only",
"element='sub01,ses01' log_element='sub01-ses01'", 'element="sub01,ses01" log_element="sub01-ses01"',
), ),
], ],
) )