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

tests: wait for session in tests requiring running GUI

Browse Source 
Since tests expose qubesd socket, qvm-start-gui should handle starting
GUI daemons (so, GUI session inside VM). Add synchronization with it
using qubes.WaitForSession service.
This commit is contained in:
Marek Marczykowski-Górecki 2017-06-21 04:45:46 +02:00
parent 376ac4b32d
commit a73dcf6016
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qubes/tests/__init__.py
View File

@ -938,6 +938,13 @@ class SystemTestsMixin(object):
'cat > {}'.format(shlex.quote(filename)),
user='root', input=content.encode('utf-8')))
@asyncio.coroutine
def wait_for_session(self, vm):
yield from asyncio.wait_for(
vm.run_service_for_stdio(
'qubes.WaitForSession', input=vm.default_user.encode()),
timeout=30)
def load_tests(loader, tests, pattern): # pylint: disable=unused-argument
# discard any tests from this module, because it hosts base classes

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

@ -68,6 +68,7 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
self.loop.run_until_complete(self.testvm1.start())
self.assertEqual(self.testvm1.get_power_state(), "Running")
self.loop.run_until_complete(self.wait_for_session(self.testvm1))
p = self.loop.run_until_complete(self.testvm1.run('xterm'))
try:
wait_count = 0
@ -110,6 +111,7 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
self.skipTest("Minimal template doesn't have 'gnome-terminal'")
self.loop.run_until_complete(self.testvm1.start())
self.assertEqual(self.testvm1.get_power_state(), "Running")
self.loop.run_until_complete(self.wait_for_session(self.testvm1))
p = self.loop.run_until_complete(self.testvm1.run('gnome-terminal'))
try:
title = 'user@{}'.format(self.testvm1.name)
@ -163,6 +165,7 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
pass
else:
xterm_desktop_path = xterm_desktop_path_debian
self.loop.run_until_complete(self.wait_for_session(self.testvm1))
self.loop.run_until_complete(
self.testvm1.run('qubes-desktop-run {}'.format(xterm_desktop_path)))
title = 'user@{}'.format(self.testvm1.name)
@ -687,6 +690,8 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
self.testvm1.start(),
self.testvm2.start()]))
self.loop.run_until_complete(self.wait_for_session(self.testvm1))
# Prepare test file
self.loop.run_until_complete(self.testvm1.run_for_stdio(
'yes teststring | dd of=testfile bs=1M count=50 iflag=fullblock'))
@ -818,6 +823,7 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
# exclude from memory balancing
self.testvm1.features['services/meminfo-writer'] = False
yield from self.testvm1.start()
yield from self.wait_for_session(self.testvm1)
# and allow large map count
yield from self.testvm1.run('echo 256000 > /proc/sys/vm/max_map_count',