Add dom0_template fixture, test_module_info, multipathd_topology

tests/integration/dom0-template/usr/sbin/modinfo

@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "modinfo for $*"

tests/integration/dom0-template/usr/sbin/multipathd

@@ -0,0 +1,2 @@
+#!/bin/sh
+echo -n "${0##*/}$*"

tests/unit/conftest.py

@@ -10,6 +10,14 @@ def testdir():
     return os.path.dirname(__file__)
 
 
+@pytest.fixture(scope="session")
+def dom0_template(testdir):
+    """Test fixture to get the directory of the dom0 template and adding it's /usr/sbin to the PATH"""
+    dom0_rootdir = testdir + "/../integration/dom0-template"
+    os.environ["PATH"] = dom0_rootdir + "/usr/sbin"  # for modinfo, mdadm, etc
+    return dom0_rootdir
+
+
 @pytest.fixture(scope="session")
 def bugtool(testdir):
     """Test fixture to import the xen-bugtool script as a module for executing unit tests on functions"""

tests/unit/test_process_output.modules

@@ -0,0 +1,3 @@
+tcp_diag 16384 0 - Live 0xffffffffc05c0000
+udp_diag 16384 0 - Live 0xffffffffc059c000
+inet_diag 24576 2 tcp_diag,udp_diag, Live 0xffffffffc0533000

tests/unit/test_process_output.py

@@ -0,0 +1,19 @@
+"""Regression tests for the bugtool helper function mdadm_arrays()"""
+
+
+def test_mdadm_arrays(bugtool, dom0_template):
+    """Assert mdadm_arrays() returning arrays of the mdadm mockup in the dom0-template"""
+    assert list(bugtool.mdadm_arrays()) == ["/dev/md0", "/dev/md1"]
+
+
+def test_module_info(bugtool, dom0_template):
+    """Assert module_info() returning module names from mockup file in the dom0-template"""
+
+    bugtool.PROC_MODULES = __file__.replace(".py", ".modules")
+    output = bugtool.module_info(bugtool.CAP_KERNEL_INFO)
+    assert output == "modinfo for tcp_diag\nmodinfo for udp_diag\nmodinfo for inet_diag\n"
+
+
+def test_multipathd_topology(bugtool, dom0_template):
+    """Assert multipathd_topology() returning the output of the faked multipathd tool"""
+    assert bugtool.multipathd_topology(bugtool.CAP_MULTIPATH) == bugtool.MULTIPATHD + "-k"

xen-bugtool

@@ -1517,9 +1517,15 @@ def csl_logs(cap):
     return output.getvalue()
 
 def multipathd_topology(cap):
-    pipe = Popen([MULTIPATHD, '-k'], bufsize=1, stdin=PIPE,
-                     stdout=PIPE, stderr=dev_null)
-    stdout, _ = pipe.communicate('show topology')
+    pipe = Popen(
+        [MULTIPATHD, "-k"],
+        universal_newlines=sys.version_info > (3, 0),
+        bufsize=1,
+        stdin=PIPE,
+        stdout=PIPE,
+        stderr=dev_null,
+    )
+    stdout, _ = pipe.communicate("show topology")
 
     return stdout