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

tests: fix qrexec abort test

Browse Source 
Exit code depends on when exactly the other end was terminated.
This commit is contained in:
Marek Marczykowski-Górecki 2019-09-21 05:26:33 +02:00
parent 784fd966a2
commit 273238bd2a
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 5 additions and 1 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

@ -285,10 +285,14 @@ class TC_00_AppVMMixin(object):
with self.qrexec_policy('test.Abort', self.testvm1, 'dom0'): with self.qrexec_policy('test.Abort', self.testvm1, 'dom0'):
try: try:
# two possible exit codes, depending on when exactly dom0
# service terminates:
# exit code 141: EPIPE (no buffered data)
# exit code 1: ECONNRESET (some buffered data remains)
stdout, _ = self.loop.run_until_complete(asyncio.wait_for( stdout, _ = self.loop.run_until_complete(asyncio.wait_for(
self.testvm1.run_for_stdio('''\ self.testvm1.run_for_stdio('''\
/usr/lib/qubes/qrexec-client-vm dom0 test.Abort \ /usr/lib/qubes/qrexec-client-vm dom0 test.Abort \
/bin/cat /dev/zero; test $? -eq 141'''), /bin/cat /dev/zero; test $? -eq 141 -o $? -eq 1'''),
timeout=10)) timeout=10))
except asyncio.TimeoutError: except asyncio.TimeoutError:
self.fail("Timeout, probably stdout wasn't closed") self.fail("Timeout, probably stdout wasn't closed")