Merge branch 'coveralls'

Author: nicoddemus

.gitignore

@@ -1,9 +1,10 @@
-*.pyc
-__pycache__
-*.log
+*.pyc
+__pycache__
+*.log
 /distribute-0.6.35.tar.gz
 /distribute-0.6.35-py2.7.egg
 /pytest_qt.egg-info
 /build
 /dist
 .env*
+.coverage

.travis.yml

@@ -31,11 +31,17 @@ install:
  - pip uninstall -y pytest
  - pip install pytest==$PYTEST_VERSION
 
+ # others
+ - pip install pytest-cov coveralls --use-wheel
+
 before_script:
  - export DISPLAY=:99.0
  - sh -e /etc/init.d/xvfb start
  - sleep 3
 
 script:
  - python setup.py develop
- - py.test
+ - coverage run --source=pytestqt setup.py test
+
+after_success:
+ - coveralls

README.rst

@@ -30,6 +30,8 @@ This allows you to test and make sure your view layer is behaving the way you ex
 
 |version| |downloads| |ci|
 
+.. Using PNG badges because PyPI doesn't support SVG
+
 .. |version| image:: http://img.shields.io/pypi/v/pytest-qt.png
   :target: https://crate.io/packages/pytest-qt
 
@@ -38,7 +40,10 @@ This allows you to test and make sure your view layer is behaving the way you ex
 
 .. |ci| image:: http://img.shields.io/travis/nicoddemus/pytest-qt.png
   :target: https://travis-ci.org/nicoddemus/pytest-qt
-  
+
+.. |coverage| image:: http://img.shields.io/coveralls/nicoddemus/pytest-qt.png
+  :target: https://coveralls.io/r/nicoddemus/pytest-qt
+
 
 Requirements
 ============

pytestqt/_tests/__init__.py

@@ -1,4 +1,4 @@
-from pytestqt.qt_compat import QtGui, Qt, QEvent
+from pytestqt.qt_compat import QtGui, Qt, QEvent, QtCore
 import pytest
 
 
@@ -55,7 +55,18 @@ def extract(mouse_event):
 
     qtbot.mousePress(event_recorder, Qt.RightButton, Qt.AltModifier)
     assert event_recorder.event_data == (QEvent.MouseButtonPress, Qt.RightButton, Qt.AltModifier)
-    
+
+
+def test_stop_for_interaction(qtbot):
+    """
+    Test qtbot.stopForInteraction()
+    """
+    widget = QtGui.QWidget()
+    qtbot.addWidget(widget)
+    qtbot.waitForWindowShown(widget)
+    QtCore.QTimer.singleShot(0, widget.close)
+    qtbot.stopForInteraction()
+
 
 class EventRecorder(QtGui.QWidget):
     """
@@ -92,5 +103,3 @@ def event_recorder(qtbot):
     return widget
 
 
-if __name__ == '__main__':
-    pytest.main(args=['-s'])

pytestqt/_tests/test_basics.py

@@ -25,7 +25,7 @@ def result(*args, **kwargs):
             functools.update_wrapper(result, qtest_method)
             return staticmethod(result)
         else:
-            return None
+            return None # pragma: no cover
 
     # inject methods from QTest into QtBot
     method_names = [

pytestqt/plugin.py

@@ -10,7 +10,7 @@
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
-if not on_rtd:
+if not on_rtd:  # pragma: no cover
     try:
         import PySide.QtCore as _QtCore
         QtCore = _QtCore
@@ -54,7 +54,7 @@ def _import_module(moduleName):
     Qt = QtCore.Qt
     QEvent = QtCore.QEvent
 
-else:
+else:  # pragma: no cover
     USING_PYSIDE = True
 
     # mock Qt when we are generating documentation at readthedocs.org

pytestqt/qt_compat.py

@@ -1,11 +1,34 @@
+import sys
+
 from setuptools import setup
+from setuptools.command.test import test as TestCommand
+
 import pytestqt
 
 
+class PyTest(TestCommand):
+    """
+    Overrides setup "test" command, taken from here:
+    http://pytest.org/latest/goodpractises.html
+    """
+
+    def finalize_options(self):
+        TestCommand.finalize_options(self)
+        self.test_args = []
+        self.test_suite = True
+
+    def run_tests(self):
+        # import here, cause outside the eggs aren't loaded
+        import pytest
+
+        errno = pytest.main([])
+        sys.exit(errno)
+
+
 setup(
     name="pytest-qt",
     version=pytestqt.version,
-    packages=['pytestqt', 'pytestqt._tests'],
+    packages=['pytestqt'],
     entry_points={
         'pytest11': ['pytest-qt = pytestqt.plugin'],
     },
@@ -31,5 +54,7 @@
         'Topic :: Software Development :: Quality Assurance',
         'Topic :: Software Development :: Testing',
         'Topic :: Software Development :: User Interfaces',
-    ]
+    ],
+    tests_requires=['pytest'],
+    cmdclass={'test': PyTest},
 )

setup.py

@@ -5,7 +5,7 @@ envlist = py26, py27, py32, py33, py34, docs
 [testenv]
 deps=pytest 
     pyside    
-commands=py.test {envsitepackagesdir}/pytestqt
+commands=py.test
 
 [testenv:docs]
 deps=pytest