Restructured project.

Author: nip3o

pytest_stepwise/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.4'

pytest_stepwise/compat.py

@@ -0,0 +1,4 @@
+try:
+    from _pytest.cacheprovider import Cache
+except ImportError:
+    from pytest_cache import Cache

pytest_stepwise.py pytest_stepwise/plugin.pypytest_stepwise.py renamed to pytest_stepwise/plugin.py

@@ -1,7 +1,5 @@
 import pytest
-from pytest_cache import Cache
-
-__version__ = '0.3'
+from .compat import Cache
 
 
 def pytest_addoption(parser):
@@ -14,7 +12,7 @@ def pytest_addoption(parser):
                     help='ignore the first failing test but stop on the next failing test')
 
 
-@pytest.mark.tryfirst
+@pytest.hookimpl(tryfirst=True)
 def pytest_configure(config):
     config.cache = Cache(config)
     config.pluginmanager.register(StepwisePlugin(config), 'stepwiseplugin')
@@ -58,6 +56,10 @@ def pytest_collection_modifyitems(self, session, config, items):
 
         config.hook.pytest_deselected(items=already_passed)
 
+    def pytest_collectreport(self, report):
+        if self.active and report.failed:
+            self.session.shouldstop = 'Error when collecting test, stopping test execution.'
+
     def pytest_runtest_logreport(self, report):
         # Skip this hook if plugin is not active or the test is xfailed.
         if not self.active or 'xfail' in report.keywords:

setup.py

@@ -11,7 +11,7 @@ def read(fname):
 
 setup(
     name='pytest-stepwise',
-    version='0.3',
+    version=__import__('pytest_stepwise').__version__,
     author='Niclas Olofsson',
     author_email='n@niclasolofsson.se',
     maintainer='Niclas Olofsson',
@@ -20,13 +20,13 @@ def read(fname):
     url='https://github.com/nip3o/pytest-stepwise',
     description='Run a test suite one failing test at a time.',
     long_description=read('README.rst'),
-    py_modules=['pytest_stepwise'],
+    packages=['pytest_stepwise'],
     install_requires=['pytest-cache >= 1.0'],
     classifiers=['Development Status :: 4 - Beta',
                  'Intended Audience :: Developers',
                  'Topic :: Software Development :: Testing',
                  'Programming Language :: Python',
                  'Operating System :: OS Independent',
                  'License :: OSI Approved :: MIT License'],
-    entry_points={'pytest11': ['stepwise = pytest_stepwise']},
+    entry_points={'pytest11': ['stepwise = pytest_stepwise.plugin']},
 )

conftest.py tests/conftest.pyconftest.py renamed to tests/conftest.py

@@ -51,6 +51,12 @@ def test_success_after_fail():
     return testdir
 
 
+@pytest.fixture
+def broken_testdir(testdir):
+    testdir.makepyfile(working_testfile='def test_proper(): assert 1', broken_testfile='foobar')
+    return testdir
+
+
 def test_run_without_stepwise(stepwise_testdir):
     result = stepwise_testdir.runpytest('-v', '--strict', '--fail')
 
@@ -121,3 +127,10 @@ def test_change_testfile(stepwise_testdir):
 
     stdout = result.stdout.str()
     assert 'test_success PASSED' in stdout
+
+
+def test_stop_on_collection_errors(broken_testdir):
+    result = broken_testdir.runpytest('-v', '--strict', '--stepwise', 'working_testfile.py', 'broken_testfile.py')
+
+    stdout = result.stdout.str()
+    assert 'Error when collecting test' in stdout