From fae1e02c1d4ee05804e9d9680adc4015f1a52188 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 10 Jun 2017 01:29:55 -0300
Subject: [PATCH 1/4] Revert "Fix missing blank line."

This reverts commit 602694b8172bc5f7cc62f2af58cb112619ae4b1a.
---
 testing/acceptance_test.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
index 27b2cfc..c7bee86 100644
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -457,7 +457,6 @@ def test_crashing_item(testdir):
     result.stdout.fnmatch_lines(
         ["*crashed*::test_crash*", "*1 failed*1 passed*"])
 
-
 def test_crashing_item_teardown(testdir):
     p = testdir.makepyfile("""
         import py

From 8e2fdeee3ee31564cc4419c10d844ffc9fb31bc3 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 10 Jun 2017 01:30:42 -0300
Subject: [PATCH 2/4] Revert "- Reinforce `test_crashing_item` to match test
 name instead of test"

This reverts commit 99f667380f125c5675490ae2935981431ab28e94.
---
 testing/acceptance_test.py | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
index c7bee86..1093661 100644
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -454,30 +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):

From 95a62460aa0f1eb2937f12a4bddb255350e52051 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 10 Jun 2017 01:33:12 -0300
Subject: [PATCH 3/4] Revert "Mark test as complete at teardown."

This reverts commit 82b992a5fd4bca9a6eb215873ce22113d54da387.
---
 xdist/dsession.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdist/dsession.py b/xdist/dsession.py
index 3377078..9ddbc2d 100644
--- a/xdist/dsession.py
+++ b/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

From afe8bad9ff29e0812d695875b940156eb947b25e Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 10 Jun 2017 09:44:55 -0300
Subject: [PATCH 4/4] Add news fragment

Fix #157
---
 changelog/157.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog/157.bugfix

diff --git a/changelog/157.bugfix b/changelog/157.bugfix
new file mode 100644
index 0000000..59bfead
--- /dev/null
+++ b/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.