From 6a516caee2bb9af46fdda0df596e4d87f1292ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 19 Jul 2016 02:11:55 +0200
Subject: [PATCH] tests: misc minor fixes

---
 tests/basic.py         | 2 +-
 tests/network.py       | 4 ++--
 tests/vm_qrexec_gui.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/basic.py b/tests/basic.py
index 485809ad..2bbe2696 100644
--- a/tests/basic.py
+++ b/tests/basic.py
@@ -878,7 +878,7 @@ class TC_04_DispVM(qubes.tests.SystemTestsMixin,
                              stderr=open(os.devnull, 'w'))
         p.stdin.write("qubesdb-read /name\n")
         p.stdin.write("echo ERROR\n")
-        p.stdin.write("poweroff\n")
+        p.stdin.write("sudo poweroff\n")
         # do not close p.stdin on purpose - wait to automatic disconnect when
         #  domain is destroyed
         timeout = 30
diff --git a/tests/network.py b/tests/network.py
index 536f6b70..2317f8dc 100644
--- a/tests/network.py
+++ b/tests/network.py
@@ -165,8 +165,8 @@ class VmNetworkingMixin(qubes.tests.SystemTestsMixin):
 
         # check for nm-applet presence
         self.assertEqual(subprocess.call([
-            'xdotool', 'search', '--all', '--name',
-            '--class', '^(NetworkManager Applet|{})$'.format(self.proxy.name)],
+            'xdotool', 'search', '--class', '{}:nm-applet'.format(
+                self.proxy.name)],
             stdout=open('/dev/null', 'w')), 0, "nm-applet window not found")
         self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 0,
                          "Ping by IP failed (after NM reconnection")
diff --git a/tests/vm_qrexec_gui.py b/tests/vm_qrexec_gui.py
index 99926672..c82f43e2 100644
--- a/tests/vm_qrexec_gui.py
+++ b/tests/vm_qrexec_gui.py
@@ -1274,7 +1274,7 @@ class TC_40_PVGrub(qubes.tests.SystemTestsMixin):
         if self.template.startswith('fedora-'):
             cmd_install1 = 'dnf clean expire-cache && ' \
                 'dnf install -y qubes-kernel-vm-support grub2-tools'
-            cmd_install2 = 'yum install -y kernel && ' \
+            cmd_install2 = 'dnf install -y kernel && ' \
                 'KVER=$(rpm -q --qf %{VERSION}-%{RELEASE}.%{ARCH} kernel) && ' \
                 'dnf install --allowerasing  -y kernel-devel-$KVER && ' \
                 'dkms autoinstall -k $KVER'