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

qubes/tests/integ/vm_qrexec_gui: some fixes

Browse Source
This commit is contained in:
Wojtek Porczyk 2017-06-06 17:34:05 +02:00 committed by Marek Marczykowski-Górecki
parent 0c0b0ea6ef
commit 139f18fa1d
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes/tests/integ/vm_qrexec_gui.py
View File

@ -111,8 +111,11 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
"termination") "termination")
self.loop.run_until_complete(asyncio.sleep(0.1)) self.loop.run_until_complete(asyncio.sleep(0.1))
finally: finally:
try:
p.terminate() p.terminate()
self.loop.run_until_complete(p.wait()) self.loop.run_until_complete(p.wait())
except ProcessLookupError: # already dead
pass
@unittest.skipUnless(spawn.find_executable('xdotool'), @unittest.skipUnless(spawn.find_executable('xdotool'),
"xdotool not installed") "xdotool not installed")
@ -151,8 +154,11 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
"termination") "termination")
self.loop.run_until_complete(asyncio.sleep(0.1)) self.loop.run_until_complete(asyncio.sleep(0.1))
finally: finally:
try:
p.terminate() p.terminate()
self.loop.run_until_complete(p.wait()) self.loop.run_until_complete(p.wait())
except ProcessLookupError: # already dead
pass
@unittest.skipUnless(spawn.find_executable('xdotool'), @unittest.skipUnless(spawn.find_executable('xdotool'),
"xdotool not installed") "xdotool not installed")