Merge pull request #60 from pytest-dev/wait-swallow-exceptions

Fix issue where where waitSignal context manager would swallow exceptions

Author: nicoddemus

pytestqt/_tests/test_wait_signal.py

@@ -217,3 +217,25 @@ def check(self, timeout, *delays):
     return StopWatch()
 
 
+@pytest.mark.parametrize('multiple, raising',
+                         [(True, True), (True, False), (False, True),
+                          (False, False)])
+def test_wait_signals_handles_exceptions(qtbot, multiple, raising):
+    """
+    Make sure waitSignal handles exceptions correctly.
+    """
+    class TestException(Exception):
+        pass
+
+    signaller = Signaller()
+
+    if multiple:
+        func = qtbot.waitSignals
+        arg = [signaller.signal, signaller.signal_2]
+    else:
+        func = qtbot.waitSignal
+        arg = signaller.signal
+
+    with pytest.raises(TestException):
+        with func(arg, timeout=10, raising=raising):
+            raise TestException

pytestqt/plugin.py

@@ -377,7 +377,9 @@ def __enter__(self):
         return self
 
     def __exit__(self, type, value, traceback):
-        self.wait()
+        if value is None:
+            # only wait if no exception happened inside the "with" block
+            self.wait()
 
 
 class SignalBlocker(_AbstractSignalBlocker):