Merge fc777a4 into 96da534

doubles/pytest_plugin.py

@@ -2,11 +2,12 @@
 
 from doubles.lifecycle import teardown, verify
 
-def pytest_runtest_call(item):
-    def verify_and_teardown_doubles():
-        try:
-            verify()
-        finally:
-            teardown()
+@pytest.hookimpl(hookwrapper=True)
+def pytest_pyfunc_call(pyfuncitem):
+    outcome = yield
 
-    item.addfinalizer(verify_and_teardown_doubles)
+    try:
+        outcome.get_result()
+        verify()
+    finally:
+        teardown()

test/conftest.py

@@ -5,10 +5,7 @@
 cov = coverage(source=('doubles',))
 cov.start()
 
-try:
-    from doubles.pytest_plugin import pytest_runtest_protocol  # noqa
-except ImportError:
-    from doubles.pytest_plugin import pytest_runtest_call  # noqa
+from doubles.pytest_plugin import pytest_pyfunc_call  # noqa
 
 
 def pytest_sessionfinish(session, exitstatus):

test/pytest_test.py

@@ -36,7 +36,7 @@ def test_that_should_fail_for_not_satisfying_expection():
     """)
     result = testdir.runpytest()
     outcomes = result.parseoutcomes()
-    assert outcomes['error'] == 2
+    assert outcomes['failed'] == 2
     expected_error = (
         "*Expected 'class_method' to be called 1 time instead of 0 times on"
         " <class 'doubles.testing.User'> with ('{arg_value}')*"