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

qubes/tests/integ/vm_qrexec_gui: change time.sleep to asyncio.sleep

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

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

@ -70,17 +70,10 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
user='root', input=content.encode('utf-8'))) user='root', input=content.encode('utf-8')))
def test_000_start_shutdown(self): def test_000_start_shutdown(self):
# TODO: wait_for, timeout
self.loop.run_until_complete(self.testvm1.start()) self.loop.run_until_complete(self.testvm1.start())
self.assertEqual(self.testvm1.get_power_state(), "Running") self.assertEqual(self.testvm1.get_power_state(), "Running")
self.loop.run_until_complete(self.testvm1.shutdown()) self.loop.run_until_complete(self.testvm1.shutdown(wait=True))
shutdown_counter = 0
while self.testvm1.is_running():
if shutdown_counter > qubes.config.defaults["shutdown_counter_max"]:
self.fail("VM hanged during shutdown")
shutdown_counter += 1
time.sleep(1)
time.sleep(1)
self.assertEqual(self.testvm1.get_power_state(), "Halted") self.assertEqual(self.testvm1.get_power_state(), "Halted")
@unittest.skipUnless(spawn.find_executable('xdotool'), @unittest.skipUnless(spawn.find_executable('xdotool'),
@ -101,9 +94,9 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
wait_count += 1 wait_count += 1
if wait_count > 100: if wait_count > 100:
self.fail("Timeout while waiting for xterm window") self.fail("Timeout while waiting for xterm window")
time.sleep(0.1) self.loop.run_until_complete(asyncio.sleep(0.1))
time.sleep(0.5) self.loop.run_until_complete(asyncio.sleep(0.5))
subprocess.check_call( subprocess.check_call(
['xdotool', 'search', '--name', title, ['xdotool', 'search', '--name', title,
'windowactivate', 'type', 'exit\n']) 'windowactivate', 'type', 'exit\n'])
@ -116,7 +109,7 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
if wait_count > 100: if wait_count > 100:
self.fail("Timeout while waiting for xterm " self.fail("Timeout while waiting for xterm "
"termination") "termination")
time.sleep(0.1) self.loop.run_until_complete(asyncio.sleep(0.1))
finally: finally:
p.terminate() p.terminate()
self.loop.run_until_complete(p.wait()) self.loop.run_until_complete(p.wait())
@ -141,9 +134,9 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
wait_count += 1 wait_count += 1
if wait_count > 100: if wait_count > 100:
self.fail("Timeout while waiting for gnome-terminal window") self.fail("Timeout while waiting for gnome-terminal window")
time.sleep(0.1) self.loop.run_until_complete(asyncio.sleep(0.1))
time.sleep(0.5) self.loop.run_until_complete(asyncio.sleep(0.5))
subprocess.check_call( subprocess.check_call(
['xdotool', 'search', '--name', title, ['xdotool', 'search', '--name', title,
'windowactivate', '--sync', 'type', 'exit\n']) 'windowactivate', '--sync', 'type', 'exit\n'])
@ -156,7 +149,7 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
if wait_count > 100: if wait_count > 100:
self.fail("Timeout while waiting for gnome-terminal " self.fail("Timeout while waiting for gnome-terminal "
"termination") "termination")
time.sleep(0.1) self.loop.run_until_complete(asyncio.sleep(0.1))
finally: finally:
p.terminate() p.terminate()
self.loop.run_until_complete(p.wait()) self.loop.run_until_complete(p.wait())
@ -191,9 +184,9 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
wait_count += 1 wait_count += 1
if wait_count > 100: if wait_count > 100:
self.fail("Timeout while waiting for xterm window") self.fail("Timeout while waiting for xterm window")
time.sleep(0.1) self.loop.run_until_complete(asyncio.sleep(0.1))
time.sleep(0.5) self.loop.run_until_complete(asyncio.sleep(0.5))
subprocess.check_call( subprocess.check_call(
['xdotool', 'search', '--name', title, ['xdotool', 'search', '--name', title,
'windowactivate', '--sync', 'type', 'exit\n']) 'windowactivate', '--sync', 'type', 'exit\n'])
@ -206,7 +199,7 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
if wait_count > 100: if wait_count > 100:
self.fail("Timeout while waiting for xterm " self.fail("Timeout while waiting for xterm "
"termination") "termination")
time.sleep(0.1) self.loop.run_until_complete(asyncio.sleep(0.1))
def test_050_qrexec_simple_eof(self): def test_050_qrexec_simple_eof(self):
"""Test for data and EOF transmission dom0->VM""" """Test for data and EOF transmission dom0->VM"""
@ -765,7 +758,7 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
# service, send it timestamp value and exists without waiting for # service, send it timestamp value and exists without waiting for
# actual time set # actual time set
time.sleep(1) self.loop.run_until_complete(asyncio.sleep(1))
vm_time, _ = self.loop.run_until_complete( vm_time, _ = self.loop.run_until_complete(
self.testvm1.run_for_stdio('date -u +%s')) self.testvm1.run_for_stdio('date -u +%s'))
self.assertAlmostEquals(int(vm_time), int(start_time), delta=30) self.assertAlmostEquals(int(vm_time), int(start_time), delta=30)