From 72240c13b65579488e1106e5bdc1acdc6129e234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 21 Jun 2017 00:10:25 +0200 Subject: [PATCH] tests: fix vm_qrexec_gui/TC_10_Generic/test_000_anyvm_deny_dom0 When method (as expected) raise an exception, service output would not be assigned. Extract it from exception object. --- qubes/tests/integ/vm_qrexec_gui.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qubes/tests/integ/vm_qrexec_gui.py b/qubes/tests/integ/vm_qrexec_gui.py index b9b3f807..00443ba6 100644 --- a/qubes/tests/integ/vm_qrexec_gui.py +++ b/qubes/tests/integ/vm_qrexec_gui.py @@ -983,10 +983,12 @@ class TC_10_Generic(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase): self.loop.run_until_complete(self.vm.start()) with self.qrexec_policy('test.AnyvmDeny', self.vm, '$anyvm'): with self.assertRaises(subprocess.CalledProcessError, - msg='$anyvm matched dom0'): - stdout, stderr = self.loop.run_until_complete( + msg='$anyvm matched dom0') as e: + self.loop.run_until_complete( self.vm.run_for_stdio( '/usr/lib/qubes/qrexec-client-vm dom0 test.AnyvmDeny')) + stdout = e.exception.output + stderr = e.exception.stderr self.assertFalse(os.path.exists(flagfile), 'Flag file created (service was run) even though should be denied,' ' qrexec-client-vm output: {} {}'.format(stdout, stderr))