tests: misc minor fixes
This commit is contained in:
parent
0ee64c74f9
commit
6a516caee2
@ -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
|
||||
|
@ -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")
|
||||
|
@ -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'
|
||||
|
Loading…
Reference in New Issue
Block a user