job-submit: now actually call some previously unused functions... (#343)

Author: tazend

pyslurm/core/job/submission.pyx

@@ -285,6 +285,9 @@ cdef class JobSubmitDescription:
         self._set_gres_binding()
         self._set_gres_tasks_per_sharing()
         self._set_min_cpus()
+        self._set_core_spec()
+        self._set_signal()
+        self._set_switches()
 
         # TODO
         # burst_buffer
@@ -523,7 +526,7 @@ cdef class JobSubmitDescription:
         if not isinstance(vals, dict):
             vals = _parse_signal_str_to_dict(vals)
 
-        self.ptr.warn_signal = u16(signal_to_num(vals.get("signal")))
+        self.ptr.warn_signal = u16(vals.get("signal"))
         self.ptr.warn_time = u16(vals.get("time"), on_noval=60)
         u16_set_bool_flag(&self.ptr.warn_flags,
                 bool(vals.get("batch_only")), slurm.KILL_JOB_BATCH)
@@ -630,7 +633,7 @@ def _parse_signal_str_to_dict(vals):
         if "@" in str(vals):
             info["time"] = val_list[1]
 
-        info["signal"] = val_list[0]
+        info["signal"] = signal_to_num(val_list[0])
 
     return info
 

tests/unit/test_job_submit.py

@@ -238,18 +238,25 @@ def test_validate_cpus():
 def test_parse_signal():
     signal = 7
     signal_dict = _parse_signal_str_to_dict(signal)
-    assert signal_dict["signal"] == "7"
+    assert signal_dict["signal"] == 7
     assert len(signal_dict) == 1
 
     signal = "7@120"
     signal_dict = _parse_signal_str_to_dict(signal)
-    assert signal_dict["signal"] == "7"
+    assert signal_dict["signal"] == 7
     assert signal_dict["time"] == "120"
     assert len(signal_dict) == 2
 
+    signal = "B:SIGUSR2@60"
+    signal_dict = _parse_signal_str_to_dict(signal)
+    assert signal_dict["signal"] == 12
+    assert signal_dict["time"] == "60"
+    assert signal_dict["batch_only"]
+    assert len(signal_dict) == 3
+
     signal = "RB:8@180"
     signal_dict = _parse_signal_str_to_dict(signal)
-    assert signal_dict["signal"] == "8"
+    assert signal_dict["signal"] == 8
     assert signal_dict["time"] == "180"
     assert signal_dict["batch_only"]
     assert signal_dict["allow_reservation_overlap"]