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

tests: make sure that DispVM service call receive EOF

Browse Source 
Even when the test fails. Otherwise the DispVM will stay alive.
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-07 18:46:54 +01:00
parent 34f7ddd41e
commit c595ac464b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/vm_qrexec_gui.py
View File

@ -837,7 +837,7 @@ class TC_20_DispVMMixin(qubes.tests.SystemTestsMixin):
dispvm = self.qc[max_qid] dispvm = self.qc[max_qid]
self.assertNotEqual(dispvm.qid, 0, "DispVM not found in qubes.xml") self.assertNotEqual(dispvm.qid, 0, "DispVM not found in qubes.xml")
self.assertTrue(dispvm.is_running()) self.assertTrue(dispvm.is_running())
try:
window_title = 'user@%s' % (dispvm.template.name + "-dvm") window_title = 'user@%s' % (dispvm.template.name + "-dvm")
p.stdin.write("gnome-terminal -e " p.stdin.write("gnome-terminal -e "
"\"sh -s -c 'echo \\\"\033]0;{}\007\\\"'\"\n". "\"sh -s -c 'echo \\\"\033]0;{}\007\\\"'\"\n".
@ -864,7 +864,7 @@ class TC_20_DispVMMixin(qubes.tests.SystemTestsMixin):
self.fail("Timeout while waiting for gnome-terminal " self.fail("Timeout while waiting for gnome-terminal "
"termination") "termination")
time.sleep(0.1) time.sleep(0.1)
finally:
p.stdin.close() p.stdin.close()
wait_count = 0 wait_count = 0