explicit emit() inside waitSignal blocks now works

.travis.yml

@@ -14,6 +14,8 @@ env:
  - PYTEST_VERSION=2.6.0 PYTEST_QT_FORCE_PYQT=false
 
 install:
+ - sudo apt-get update
+
  # Qt
  - python install-qt.py
 

pytestqt/_tests/test_wait_signal.py

@@ -23,7 +23,7 @@ def explicit_wait(qtbot, signal, timeout):
     Explicit wait for the signal using blocker API.
     """
     blocker = qtbot.waitSignal(signal, timeout)
-    assert blocker.signal_triggered is None
+    assert not blocker.signal_triggered
     blocker.wait()
     return blocker
 
@@ -73,3 +73,14 @@ def test_signal_triggered(qtbot, wait_function, emit_delay, timeout,
         timeout = emit_delay * 4
     max_wait_ms = max(emit_delay, timeout)
     assert time.time() - start_time < (max_wait_ms / 1000.0)
+
+
+def test_explicit_emit(qtbot):
+    """
+    Make sure an explicit emit() inside a waitSignal block works.
+    """
+    signaller = Signaller()
+    with qtbot.waitSignal(signaller.signal, timeout=5000) as waiting:
+        signaller.signal.emit()
+
+    assert waiting.signal_triggered

pytestqt/plugin.py

@@ -280,7 +280,7 @@ def __init__(self, timeout=1000):
         self._loop = QtCore.QEventLoop()
         self._signals = []
         self.timeout = timeout
-        self.signal_triggered = None
+        self.signal_triggered = False
 
     def wait(self):
         """
@@ -289,11 +289,12 @@ def wait(self):
         :raise ValueError: if no signals are connected and timeout is None; in
             this case it would wait forever.
         """
+        if self.signal_triggered:
+            return
         if self.timeout is None and len(self._signals) == 0:
             raise ValueError("No signals or timeout specified.")
         if self.timeout is not None:
             QtCore.QTimer.singleShot(self.timeout, self._loop.quit)
-        self.signal_triggered = False
         self._loop.exec_()
 
     def connect(self, signal):
@@ -306,7 +307,6 @@ def connect(self, signal):
         signal.connect(self._quit_loop_by_signal)
         self._signals.append(signal)
 
-
     def _quit_loop_by_signal(self):
         """
         quits the event loop and marks that we finished because of a signal.