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

tests: fix qvm-sync-clock test for asyncio and new time sync API

Browse Source 
qvm-sync-clock in dom0 now synchronize only dom0 time. For VM time,
qvm-sync-clock needs to be called in VM. Also, both will communicate
with qubesd, so must be called asynchronously from tests.
This commit is contained in:
Marek Marczykowski-Górecki 2017-09-01 12:58:20 +02:00
parent a3f542edcd
commit d676576600
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -735,8 +735,7 @@ class TC_00_AppVMMixin(object):
if self.template.startswith('whonix-'): if self.template.startswith('whonix-'):
self.skipTest('qvm-sync-clock disabled for Whonix VMs') self.skipTest('qvm-sync-clock disabled for Whonix VMs')
self.loop.run_until_complete(asyncio.wait([ self.loop.run_until_complete(asyncio.wait([
self.testvm1.start(), self.testvm1.start()]))
self.testvm2.start()]))
start_time = subprocess.check_output(['date', '-u', '+%s']) start_time = subprocess.check_output(['date', '-u', '+%s'])
try: try:
@ -745,27 +744,23 @@ class TC_00_AppVMMixin(object):
# break vm and dom0 time, to check if qvm-sync-clock would fix it # break vm and dom0 time, to check if qvm-sync-clock would fix it
subprocess.check_call(['sudo', 'date', '-s', '2001-01-01T12:34:56'], subprocess.check_call(['sudo', 'date', '-s', '2001-01-01T12:34:56'],
stdout=subprocess.DEVNULL) stdout=subprocess.DEVNULL)
self.loop.run_until_complete(asyncio.wait([ self.loop.run_until_complete(
self.testvm1.run_for_stdio('date -s 2001-01-01T12:34:56', self.testvm1.run_for_stdio('date -s 2001-01-01T12:34:56',
user='root'), user='root'))
self.testvm2.run_for_stdio('date -s 2001-01-01T12:34:56',
user='root'),
]))
subprocess.check_call(['qvm-sync-clock'], stdout=subprocess.DEVNULL) p = self.loop.run_until_complete(
# qvm-sync-clock is asynchronous - it spawns qubes.SetDateTime asyncio.create_subprocess_exec('sudo', 'qvm-sync-clock',
# service, send it timestamp value and exists without waiting for stdout=asyncio.subprocess.DEVNULL))
# actual time set self.loop.run_until_complete(p.wait())
self.assertEqual(p.returncode, 0)
self.loop.run_until_complete(
self.testvm1.run_for_stdio('qvm-sync-clock',
user='root'))
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)
vm_time, _ = self.loop.run_until_complete(
self.testvm2.run_for_stdio('date -u +%s'))
self.assertAlmostEquals(int(vm_time), int(start_time), delta=30)
dom0_time, _ = subprocess.check_output(['date', '-u', '+%s']) dom0_time, _ = subprocess.check_output(['date', '-u', '+%s'])
self.assertAlmostEquals(int(dom0_time), int(start_time), delta=30) self.assertAlmostEquals(int(dom0_time), int(start_time), delta=30)