Skip to content

report: decode crash output to string in add_kernel_crash_info #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bdrung wants to merge 1 commit into
base: main
Choose a base branch
from
Open

report: decode crash output to string in add_kernel_crash_info #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apport/report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,8 @@ def add_kernel_crash_info(self) -> bool:
crash = subprocess.run(
command,
check=False,
input=b"bt -a -f\nps\nrunq\nquit\n",
encoding="UTF-8",
input="bt -a -f\nps\nrunq\nquit\n",
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
)
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/test_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,7 @@ def test_add_kernel_crash_info_no_vmcore(self) -> None:
def test_add_kernel_crash_info(self, run_mock: MagicMock) -> None:
"""add_kernel_crash_info() on a fake vmcore."""
run_mock.return_value = subprocess.CompletedProcess(
args=MagicMock(), returncode=0, stdout=b"kernel stack trace", stderr=b""
args=MagicMock(), returncode=0, stdout="kernel stack trace", stderr=""
)
report = apport.report.Report("KernelCrash")
report["VmCore"] = problem_report.CompressedValue(b"\x01" * 100, name="VmCore")
Expand All @@ -1607,7 +1607,7 @@ def test_add_kernel_crash_info(self, run_mock: MagicMock) -> None:

self.assertTrue(report.add_kernel_crash_info())

self.assertEqual(report.get("Stacktrace"), b"kernel stack trace")
self.assertEqual(report.get("Stacktrace"), "kernel stack trace")
run_mock.assert_called_once()
called_cmd = run_mock.call_args[0][0]
self.assertEqual(
Expand All @@ -1623,8 +1623,8 @@ def test_add_kernel_crash_info_fail(self, run_mock: MagicMock) -> None:
run_mock.return_value = subprocess.CompletedProcess(
args=MagicMock(),
returncode=1,
stdout=b"read_maps: unable to read header from $vmcore, errno = 0",
stderr=b"",
stdout="read_maps: unable to read header from $vmcore, errno = 0",
stderr="",
)
report = apport.report.Report("KernelCrash")
report["VmCore"] = b"\x01" * 100
Expand Down
Loading