Merge remote-tracking branch 'origin/master' into logging

Conflicts:
	.travis.yml
	pytestqt/plugin.py

Author: nicoddemus

.gitignore

@@ -6,5 +6,6 @@ __pycache__
 /pytest_qt.egg-info
 /build
 /dist
+/.tox
 .env*
 .coverage

.project

@@ -10,12 +10,12 @@ virtualenv:
 matrix:
   allow_failures:
     # unfortunately couldn't find a reliable way to test pyqt5 on travis yet
-    - env: PYTEST_VERSION=2.7.0 PYTEST_QT_API=pyqt5
+    - env: PYTEST_VERSION=2.7.1 PYTEST_QT_API=pyqt5
 
 env:
- - PYTEST_VERSION=2.7.0 PYTEST_QT_API=pyqt4
- - PYTEST_VERSION=2.7.0 PYTEST_QT_API=pyside
- - PYTEST_VERSION=2.7.0 PYTEST_QT_API=pyqt5
+ - PYTEST_VERSION=2.7.1 PYTEST_QT_API=pyqt4
+ - PYTEST_VERSION=2.7.1 PYTEST_QT_API=pyside
+ - PYTEST_VERSION=2.7.1 PYTEST_QT_API=pyqt5
 
 install:
  - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
@@ -36,9 +36,10 @@ before_script:
  - sh -e /etc/init.d/xvfb start
  - sleep 3
 
+
 script:
  - python setup.py develop
- - coverage run --source=pytestqt setup.py test
+ - catchsegv coverage run --source=pytestqt setup.py test
 
 after_success:
  - coveralls

.pydevproject

@@ -109,6 +109,7 @@ Many thanks to:
 - Benjamin Audren (`@baudren <https://github.com/baudren>`_);
 - Fabio Zadrozny (`@fabioz <https://github.com/fabioz>`_);
 - Datalyze Solutions (`@datalyze-solutions <https://github.com/datalyze-solutions>`_);
+- Florian Bruhin (`@The-Compiler <https://github.com/The-Compiler>`_);
 
 **Powered by**
 

.travis.yml

@@ -92,16 +92,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-if on_rtd:
-    html_theme = 'default'
-else:
-    #html_theme = 'agogo'
-    html_theme = 'sphinxdoc'
-    #html_theme = 'scrolls'
-    #html_theme = 'nature'
-    #html_theme = 'haiku'
-    #html_theme = 'pyramid'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

README.rst

@@ -140,6 +140,8 @@ created earlier::
 Waiting for threads, processes, etc.
 ====================================
 
+.. versionadded:: 1.2
+
 If your program has long running computations running in other threads or
 processes, you can use :meth:`qtbot.waitSignal <pytestqt.plugin.QtBot.waitSignal>`
 to block a test until a signal is emitted (such as ``QThread.finished``) or a
@@ -161,9 +163,50 @@ ensuring the results are correct::
         assert_application_results(app)
 
 
+
+raising
+-------
+
+.. versionadded:: 1.4
+
+Additionally, you can pass ``raising=True`` to raise a
+:class:`qtbot.SignalTimeoutError <SignalTimeoutError>` if the timeout is
+reached before the signal is triggered::
+
+    def test_long_computation(qtbot):
+        ...
+        with qtbot.waitSignal(app.worker.finished, raising=True) as blocker:
+            app.worker.start()
+        # if timeout is reached, qtbot.SignalTimeoutError will be raised at this point
+        assert_application_results(app)
+
+
+waitSignals
+-----------
+
+.. versionadded:: 1.4
+
+If you have to wait until **all** signals in a list are triggered, use
+:meth:`qtbot.waitSignals <pytestqt.plugin.QtBot.waitSignals>`, which receives
+a list of signals instead of a single signal. As with
+:meth:`qtbot.waitSignal <pytestqt.plugin.QtBot.waitSignal>`, it also supports
+the new ``raising`` parameter::
+
+    def test_workers(qtbot):
+        workers = spawn_workers()
+        with qtbot.waitSignal([w.finished for w in workers], raising=True):
+            for w in workers:
+                w.start()
+
+        # this will be reached after all workers emit their "finished"
+        # signal or a qtbot.SignalTimeoutError will be raised
+        assert_application_results(app)
+
 Exceptions in virtual methods
 =============================
 
+.. versionadded:: 1.1
+
 It is common in Qt programming to override virtual C++ methods to customize
 behavior, like listening for mouse events, implement drawing routines, etc.
 
@@ -229,10 +272,13 @@ QtBot
 .. module:: pytestqt.plugin
 .. autoclass:: QtBot
 
-SignalBlocker
--------------
+Signals
+-------
 
 .. autoclass:: SignalBlocker
+.. autoclass:: MultiSignalBlocker
+
+.. autoclass:: SignalTimeoutError
 
 Versioning
 ==========

docs/conf.py

@@ -4,23 +4,24 @@
 '''
 import os
 import sys
+import subprocess
 
-def run(cmd):
-    print(cmd)
-    r = os.system(cmd)
-    if r != 0:
-        sys.exit('command %s failed with status %s' % (cmd, r))
+
+def install(packages):
+    print('Installing %s...' % ', '.join(packages))
+    subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + packages)
 
 py3k = sys.version_info[0] == 3
 if os.environ['PYTEST_QT_API'] in ('pyqt4', 'pyqt5'):
     pyqt_ver = os.environ['PYTEST_QT_API'][-1]
     if py3k:
-        run('sudo apt-get install -qq python3-pyqt%s' % pyqt_ver)
+        pkg = 'python3-pyqt%s' % pyqt_ver
     else:
-        run('sudo apt-get install -qq python-qt%s' % pyqt_ver)
+        pkg = 'python-qt%s' % pyqt_ver
+    install([pkg, pkg + '-dbg'])
 else:
     if py3k:
-        run('sudo apt-get install -qq python3-pyside')
+        pkg = 'python3-pyside'
     else:
-        run('sudo apt-get install -qq python-pyside')
-
+        pkg = 'python-pyside'
+    install([pkg])