tests: minor adjustments for guix template

qubes/tests/integ/audio.py

@@ -35,7 +35,7 @@
 from qubes.tests.integ.vm_qrexec_gui import TC_00_AppVMMixin, in_qemu
 
 
-@qubes.tests.skipIfTemplate("whonix-g")
+@qubes.tests.skipIfTemplate("whonix-g", "guix-minimal")
 class TC_00_AudioMixin(TC_00_AppVMMixin):
     def tearDown(self):
         if not self.success():

qubes/tests/integ/network.py

@@ -1017,11 +1017,15 @@ def test_100_late_xldevd_startup(self):
         """
         # Simulater late xl devd startup
         cmd = "systemctl stop xendriverdomain"
+        if "guix" in self.template:
+            cmd = "herd stop xendriverdomain"
         if self.run_cmd(self.testnetvm, cmd) != 0:
             self.fail("Command failed on '%s': '%s'" % (self.testnetvm, cmd))
         self.loop.run_until_complete(self.start_vm(self.testvm1))
 
         cmd = "systemctl start xendriverdomain"
+        if "guix" in self.template:
+            cmd = "herd start xendriverdomain"
         if self.run_cmd(self.testnetvm, cmd) != 0:
             self.fail("Command failed on '%s': '%s'" % (self.testnetvm, cmd))
 

qubes/tests/integ/salt.py

@@ -310,6 +310,8 @@ def setUp(self):
             self.skipTest("Whonix not supported as salt VM")
         if self.template.startswith("archlinux"):
             self.skipTest("Archlinux not supported as salt VM")
+        if self.template.startswith("guix"):
+            self.skipTest("Guix not supported as salt VM")
         super(SaltVMTestMixin, self).setUp()
         self.init_default_template(self.template)
 

qubes/tests/integ/vm_qrexec_gui.py

@@ -83,11 +83,11 @@ def test_010_run_xterm(self):
         self.assertEqual(self.testvm1.get_power_state(), "Running")
 
         self.loop.run_until_complete(self.wait_for_session(self.testvm1))
-        p = self.loop.run_until_complete(self.testvm1.run("xterm"))
+        title = "user@{}".format(self.testvm1.name)
+        p = self.loop.run_until_complete(
+            self.testvm1.run(f"xterm -title {title}")
+        )
         try:
-            title = "user@{}".format(self.testvm1.name)
-            if self.template.count("whonix"):
-                title = "user@host"
             self.wait_for_window(title)
 
             self.loop.run_until_complete(asyncio.sleep(0.5))
@@ -123,6 +123,8 @@ def test_011_run_gnome_terminal(self):
             self.skipTest("Xfce template doesn't have 'gnome-terminal'")
         if "archlinux" in self.template:
             self.skipTest("Arch template doesn't have 'gnome-terminal'")
+        if "guix" in self.template:
+            self.skipTest("Guix template doesn't have 'gnome-terminal'")
         self.loop.run_until_complete(self.testvm1.start())
         self.assertEqual(self.testvm1.get_power_state(), "Running")
         self.loop.run_until_complete(self.wait_for_session(self.testvm1))
@@ -373,9 +375,11 @@ def test_115_qrexec_filecopy_no_agent(self):
 
         with self.qrexec_policy("qubes.Filecopy", self.testvm1, self.testvm2):
             try:
+                service_ctl = "herd" if "guix" in self.template else "systemctl"
                 self.loop.run_until_complete(
                     self.testvm2.run_for_stdio(
-                        "systemctl stop qubes-qrexec-agent.service", user="root"
+                        f"{service_ctl} stop qubes-qrexec-agent.service",
+                        user="root",
                     )
                 )
             except subprocess.CalledProcessError: