diff --git a/shared/workspaces/test/test_workflow_service.py b/shared/workspaces/test/test_workflow_service.py index 3a8f2f9a2d6e1c97413fc39c4cc41d06d888cf0e..4d9f37d3a01c7d56963e13c5143a30cab9000234 100644 --- a/shared/workspaces/test/test_workflow_service.py +++ b/shared/workspaces/test/test_workflow_service.py @@ -424,6 +424,6 @@ class TestWorkflowService: def test_condor_name_utility(): t = WorkflowTemplate() t.filename = "foo.dag" - t.content = b"{{#make_condor_jobid}}T10t10/J2030+2093.23{{/make_condor_jobid}}" + t.content = b"{{#make_condor_jobname}}T10t10/J2030+2093.23{{/make_condor_jobname}}" file = t.render({}) assert file.content == b"T10t10/J2030-2093-23" diff --git a/shared/workspaces/workspaces/workflow/schema.py b/shared/workspaces/workspaces/workflow/schema.py index 2ad5457628c25c5aff78db2decbfd958136934ca..9501c074ab383147f35f777c594eac26f86b82cd 100644 --- a/shared/workspaces/workspaces/workflow/schema.py +++ b/shared/workspaces/workspaces/workflow/schema.py @@ -119,7 +119,7 @@ class WorkflowTemplate(JSONSerializable): :return: an AbstractFile rendered from mustache template """ # add some rendering helpers to the argument - render_helpers = {"make_condor_jobid": self.make_condor_jobid} + render_helpers = {"make_condor_jobname": self.make_condor_jobname} argument = {**render_helpers, **argument} # render @@ -153,7 +153,7 @@ class WorkflowTemplate(JSONSerializable): return WorkflowTemplate(json["filename"], json["content"]) @staticmethod - def make_condor_jobid(content: str, renderer: Callable[[str], str]): + def make_condor_jobname(content: str, renderer: Callable[[str], str]): # get the rendered content rendered = renderer(content) return rendered.replace(".", "-").replace("+", "-")