jupyter/spawner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enforce job_id as string

Browse source
This commit is contained in:
Benoît Seignovert 2024-03-22 19:58:02 +01:00
parent aaf16ee89d
commit 5cdee4d73d
Signed by: Benoît Seignovert
GPG key ID: F5D8895227D18A0B
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glicid_spawner/spawner.py
View file

@ -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:

4
tests/test_spawner.py
View file

@ -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):