Merge pull request #158 from nicoddemus/revert-pr-125

Revert PR 125 due to 1.17.0 breakage

changelog/157.bugfix

@@ -0,0 +1 @@
+Hot fix release reverting the change introduced by #124, unfortunately it broke a number of test suites so we are reversing this change while we investigate the problem.

testing/acceptance_test.py

@@ -454,31 +454,9 @@ def test_crashing_item(testdir):
             pass
     """)
     result = testdir.runpytest("-n2", p)
-    result.stdout.fnmatch_lines(
-        ["*crashed*::test_crash*", "*1 failed*1 passed*"])
-
-
-def test_crashing_item_teardown(testdir):
-    p = testdir.makepyfile("""
-        import py
-        import pytest
-        import os
-        import time
-
-        @pytest.fixture
-        def crash_fixture(request):
-            def kill_me():
-                py.process.kill(os.getpid())
-            request.addfinalizer(kill_me)
-
-        def test_a(crash_fixture):
-            pass
-
-        def test_b():
-            pass
-    """)
-    result = testdir.runpytest("-n1", p)
-    result.stdout.fnmatch_lines(["*crashed*::test_a*", "*1 failed*2 passed*"])
+    result.stdout.fnmatch_lines([
+        "*crashed*test_crash*", "*1 failed*1 passed*"
+    ])
 
 
 def test_skipping(testdir):

xdist/dsession.py

@@ -660,7 +660,7 @@ class DSession:
         If the node indicates it is finished with a test item, remove
         the item from the pending list in the scheduler.
         """
-        if rep.when == "teardown" or (rep.when == "setup" and not rep.passed):
+        if rep.when == "call" or (rep.when == "setup" and not rep.passed):
             self.sched.mark_test_complete(node, rep.item_index, rep.duration)
         # self.report_line("testreport %s: %s" %(rep.id, rep.status))
         rep.node = node