Skip to content

Commit

Permalink
tests: adjust for qrexec-client-vm exit code
Browse files Browse the repository at this point in the history
It now consistently returns remote exit code, not a local one.
Check 'cat' exit code instead.

(cherry picked from commit d033457)
  • Loading branch information
marmarek committed Apr 18, 2020
1 parent c4ab3f3 commit e76de2e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion qubes/tests/integ/vm_qrexec_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,9 @@ def test_055_qrexec_dom0_service_abort(self):
stdout, _ = self.loop.run_until_complete(asyncio.wait_for(
self.testvm1.run_for_stdio('''\
/usr/lib/qubes/qrexec-client-vm dom0 test.Abort \
/bin/cat /dev/zero; test $? -eq 141 -o $? -eq 1'''),
/bin/sh -c 'cat /dev/zero; echo $? >/tmp/exit-code';
e=$(cat /tmp/exit-code);
test $e -eq 141 -o $e -eq 1'''),
timeout=10))
except asyncio.TimeoutError:
self.fail("Timeout, probably stdout wasn't closed")
Expand Down

0 comments on commit e76de2e

Please sign in to comment.