feat: set signal name during crash collection

Signal numbers vary by architecture. So include the signal name during
crash collection to avoid getting the wrong name when reprocessing on a
different architecture.

Signed-off-by: Benjamin Drung <benjamin.drung@canonical.com>

apport/report.py

@@ -1254,6 +1254,9 @@ def _get_ignore_dom():
 
     def _get_signal_name(self) -> str:
         signal_number = int(self["Signal"])
+        signal_name = self.get("SignalName")
+        if signal_name:
+            return signal_name
         try:
             return signal.Signals(signal_number).name
         except ValueError:

data/apport

@@ -905,6 +905,12 @@ def process_crash(options: argparse.Namespace) -> int:
         return 1
 
 
+def _set_signal(report: apport.report.Report, signal_number: int) -> None:
+    report["Signal"] = str(signal_number)
+    with contextlib.suppress(ValueError):
+        report["SignalName"] = signal.Signals(signal_number).name
+
+
 def process_crash_with_proc_pid(options: argparse.Namespace, proc_pid: ProcPid) -> int:
     # TODO: Split into smaller functions/methods
     # pylint: disable=too-many-branches,too-many-locals
@@ -939,7 +945,7 @@ def process_crash_with_proc_pid(options: argparse.Namespace, proc_pid: ProcPid)
         return 0
 
     info = apport.report.Report("Crash")
-    info["Signal"] = str(options.signal_number)
+    _set_signal(info, options.signal_number)
     core_size_limit = usable_ram() * 3 / 4
     # sys.stdin has type io.TextIOWrapper, not the claimed io.TextIO.
     # See https://github.com/python/typeshed/issues/10093

tests/unit/test_report.py

@@ -70,6 +70,7 @@ def test_standard_title(self):
 
         # named signal crash
         report["Signal"] = "11"
+        report["SignalName"] = "SIGSEGV"
         report["ExecutablePath"] = "/bin/bash"
         report["StacktraceTop"] = textwrap.dedent(
             """\
@@ -82,6 +83,7 @@ def test_standard_title(self):
 
         # unnamed signal crash
         report["Signal"] = "42"
+        del report["SignalName"]
         self.assertEqual(
             report.standard_title(), "bash crashed with signal 42 in foo()"
         )
@@ -102,6 +104,7 @@ def test_standard_title(self):
 
         # assertion message
         report["Signal"] = "6"
+        report["SignalName"] = "SIGABRT"
         report["ExecutablePath"] = "/bin/bash"
         report["AssertionMessage"] = "foo.c:42 main: i > 0"
         self.assertEqual(
@@ -240,6 +243,7 @@ def test_standard_title(self):
 
         # matching package/system architectures
         report["Signal"] = "11"
+        report["SignalName"] = "SIGSEGV"
         report["ExecutablePath"] = "/bin/bash"
         report["StacktraceTop"] = textwrap.dedent(
             """\
@@ -597,6 +601,7 @@ def test_gen_stacktrace_top(self):
     def test_gdb_add_info_no_gdb(self):
         r = apport.report.Report()
         r["Signal"] = "6"
+        r["SignalName"] = "SIGABRT"
         r["ExecutablePath"] = "/bin/bash"
         r["CoreDump"] = "/var/lib/apport/coredump/core.bash"
         r["AssertionMessage"] = "foo.c:42 main: i > 0"
@@ -769,6 +774,7 @@ def test_crash_signature(self):
         # assertion failures
         r = apport.report.Report()
         r["Signal"] = "6"
+        r["SignalName"] = "SIGABRT"
         r["ExecutablePath"] = "/bin/bash"
         r["AssertionMessage"] = "foo.c:42 main: i > 0"
         self.assertEqual(r.crash_signature(), "/bin/bash:foo.c:42 main: i > 0")