Bladeren bron

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.
Marek Marczykowski-Górecki 7 jaren geleden
bovenliggende
commit
72240c13b6
1 gewijzigde bestanden met toevoegingen van 4 en 2 verwijderingen
  1. 4 2
      qubes/tests/integ/vm_qrexec_gui.py

+ 4 - 2
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))