Skip to content

Commit

Permalink
CP-49659: Fix modinfo.out when modinfo returns non-ASCII characters
Browse files Browse the repository at this point in the history
Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
  • Loading branch information
bernhardkaindl committed May 23, 2024
1 parent c95b5b7 commit 2bc9efe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions tests/unit/test_process_output.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
"""Regression tests for the bugtool helper function mdadm_arrays()"""

import pytest


def test_mdadm_arrays(bugtool, dom0_template):
"""Assert mdadm_arrays() returning arrays dom0_template/usr/sbin/mdadm"""
bugtool.MDADM = dom0_template + "/usr/sbin/mdadm"
assert list(bugtool.mdadm_arrays()) == ["/dev/md0", "/dev/md1"]


@pytest.mark.xfail("True", reason="Python2 decode() fails with UTF-8: remove it next")
def test_module_info(bugtool, dom0_template):
"""Assert module_info() returning module names from test_module_info.modules"""

Expand Down
2 changes: 1 addition & 1 deletion xen-bugtool
Original file line number Diff line number Diff line change
Expand Up @@ -1671,7 +1671,7 @@ def module_info(cap):

run_procs([procs])

return output.getvalue().decode()
return output.getvalue()


def multipathd_topology(cap):
Expand Down

0 comments on commit 2bc9efe

Please sign in to comment.