Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: fix DispVM related tests

Browse Source 
- fix regex for editor window search - 'disp*' matches 'disk_space.py'
(a dom0 local widget...)
- increase a timeout for automatic DispVM cleanup
This commit is contained in:
Marek Marczykowski-Górecki 2018-07-15 22:29:22 +02:00
parent f8d17012c3
commit c688641363
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubes/tests/integ/dispvm.py
View File

@ -69,7 +69,7 @@ class TC_04_DispVM(qubes.tests.SystemTestCase):
self.assertEqual(lines[0], "test") self.assertEqual(lines[0], "test")
dispvm_name = lines[1] dispvm_name = lines[1]
# wait for actual DispVM destruction # wait for actual DispVM destruction
self.loop.run_until_complete(asyncio.sleep(1)) self.loop.run_until_complete(asyncio.sleep(5))
self.assertNotIn(dispvm_name, self.app.domains) self.assertNotIn(dispvm_name, self.app.domains)
def test_003_cleanup_destroyed(self): def test_003_cleanup_destroyed(self):
@ -88,7 +88,7 @@ class TC_04_DispVM(qubes.tests.SystemTestCase):
p.stdin.write(b"sudo poweroff\n") p.stdin.write(b"sudo poweroff\n")
# do not close p.stdin on purpose - wait to automatic disconnect when # do not close p.stdin on purpose - wait to automatic disconnect when
# domain is destroyed # domain is destroyed
timeout = 30 timeout = 70
lines_task = asyncio.ensure_future(p.stdout.read()) lines_task = asyncio.ensure_future(p.stdout.read())
self.loop.run_until_complete(asyncio.wait_for(p.wait(), timeout)) self.loop.run_until_complete(asyncio.wait_for(p.wait(), timeout))
self.loop.run_until_complete(lines_task) self.loop.run_until_complete(lines_task)
@ -171,7 +171,7 @@ class TC_20_DispVMMixin(object):
del dispvm del dispvm
# give it a time for shutdown + cleanup # give it a time for shutdown + cleanup
self.loop.run_until_complete(asyncio.sleep(2)) self.loop.run_until_complete(asyncio.sleep(5))
self.assertNotIn(dispvm_name, self.app.domains, self.assertNotIn(dispvm_name, self.app.domains,
"DispVM not removed from qubes.xml") "DispVM not removed from qubes.xml")
@ -252,7 +252,8 @@ class TC_20_DispVMMixin(object):
while True: while True:
search = self.loop.run_until_complete( search = self.loop.run_until_complete(
asyncio.create_subprocess_exec( asyncio.create_subprocess_exec(
'xdotool', 'search', '--onlyvisible', '--class', 'disp*', 'xdotool', 'search', '--onlyvisible', '--class',
'disp[0-9]*',
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.DEVNULL)) stderr=subprocess.DEVNULL))
stdout, _ = self.loop.run_until_complete(search.communicate()) stdout, _ = self.loop.run_until_complete(search.communicate())