Skip to content

Commit fdd2fac

Browse files
committed
job-submit: now actually call some previously unused functions... (#343)
1 parent b20ff49 commit fdd2fac

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

pyslurm/core/job/submission.pyx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@ cdef class JobSubmitDescription:
284284
self._set_gpu_binding()
285285
self._set_gres_binding()
286286
self._set_min_cpus()
287+
self._set_core_spec()
288+
self._set_signal()
289+
self._set_switches()
287290

288291
# TODO
289292
# burst_buffer
@@ -522,7 +525,7 @@ cdef class JobSubmitDescription:
522525
if not isinstance(vals, dict):
523526
vals = _parse_signal_str_to_dict(vals)
524527

525-
self.ptr.warn_signal = u16(signal_to_num(vals.get("signal")))
528+
self.ptr.warn_signal = u16(vals.get("signal"))
526529
self.ptr.warn_time = u16(vals.get("time"), on_noval=60)
527530
u16_set_bool_flag(&self.ptr.warn_flags,
528531
bool(vals.get("batch_only")), slurm.KILL_JOB_BATCH)
@@ -617,7 +620,7 @@ def _parse_signal_str_to_dict(vals):
617620
if "@" in str(vals):
618621
info["time"] = val_list[1]
619622

620-
info["signal"] = val_list[0]
623+
info["signal"] = signal_to_num(val_list[0])
621624

622625
return info
623626

tests/unit/test_job_submit.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,18 +238,25 @@ def test_validate_cpus():
238238
def test_parse_signal():
239239
signal = 7
240240
signal_dict = _parse_signal_str_to_dict(signal)
241-
assert signal_dict["signal"] == "7"
241+
assert signal_dict["signal"] == 7
242242
assert len(signal_dict) == 1
243243

244244
signal = "7@120"
245245
signal_dict = _parse_signal_str_to_dict(signal)
246-
assert signal_dict["signal"] == "7"
246+
assert signal_dict["signal"] == 7
247247
assert signal_dict["time"] == "120"
248248
assert len(signal_dict) == 2
249249

250+
signal = "B:SIGUSR2@60"
251+
signal_dict = _parse_signal_str_to_dict(signal)
252+
assert signal_dict["signal"] == 12
253+
assert signal_dict["time"] == "60"
254+
assert signal_dict["batch_only"]
255+
assert len(signal_dict) == 3
256+
250257
signal = "RB:8@180"
251258
signal_dict = _parse_signal_str_to_dict(signal)
252-
assert signal_dict["signal"] == "8"
259+
assert signal_dict["signal"] == 8
253260
assert signal_dict["time"] == "180"
254261
assert signal_dict["batch_only"]
255262
assert signal_dict["allow_reservation_overlap"]

0 commit comments

Comments
 (0)