From 5cdee4d73dca26002994f556bc87413be5d6575f Mon Sep 17 00:00:00 2001 From: Benoit Seignovert Date: Fri, 22 Mar 2024 19:58:02 +0100 Subject: [PATCH] Enforce job_id as string --- src/glicid_spawner/spawner.py | 6 +++--- tests/test_spawner.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/glicid_spawner/spawner.py b/src/glicid_spawner/spawner.py index 12f8339..cdd7631 100644 --- a/src/glicid_spawner/spawner.py +++ b/src/glicid_spawner/spawner.py @@ -80,7 +80,7 @@ class GlicidSpawner(SlurmSpawner): slurm_job_id_re = Unicode(r'(\d+)(?:;(\w+))?').tag(config=True) - def parse_job_id(self, output): + def parse_job_id(self, output) -> str: """Parse job id with cluster name support. If cluster name is present, `job_id` will be a string @@ -88,10 +88,10 @@ class GlicidSpawner(SlurmSpawner): """ for job_id, job_cluster in re.findall(self.slurm_job_id_re, output): - return f'{job_id} -M {job_cluster}' if job_cluster else int(job_id) + return f'{job_id} -M {job_cluster}' if job_cluster else job_id self.log.error(f'GlicidSpawner unable to parse job ID from text: {output}') - return None + return '' @default('options_form') def _options_form_default(self) -> str: diff --git a/tests/test_spawner.py b/tests/test_spawner.py index e6e430e..8ac208b 100644 --- a/tests/test_spawner.py +++ b/tests/test_spawner.py @@ -79,10 +79,10 @@ def test_spawner_parse_job_id(): """Test spawner job id parser.""" spawner = GlicidSpawner() - assert spawner.parse_job_id('123') == 123 + assert spawner.parse_job_id('123') == '123' assert spawner.parse_job_id('456;nautilus') == '456 -M nautilus' - assert spawner.parse_job_id('') is None + assert spawner.parse_job_id('') == '' def test_spawner_options_form(monkeypatch):