CP-49659: Fix modinfo.out when modinfo returns non-ASCII characters

Signed-off-by: Bernhard Kaindl <[email protected]>
xenserver · May 23, 2024 · 2bc9efe · 2bc9efe
1 parent c95b5b7
commit 2bc9efe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/tests/unit/test_process_output.py b/tests/unit/test_process_output.py
@@ -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"""
 

diff --git a/xen-bugtool b/xen-bugtool
@@ -1671,7 +1671,7 @@ def module_info(cap):
 
     run_procs([procs])
 
-    return output.getvalue().decode()
+    return output.getvalue()
 
 
 def multipathd_topology(cap):