From ff2f66d84affb0fbcbf841b1897c7599026730bc Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Fri, 23 Feb 2024 15:34:32 +0200
Subject: [PATCH] [8.0.x] Revert "Fix teardown error reporting when
 `--maxfail=1` (#11721)"

---
 changelog/12021.bugfix.rst |  1 +
 doc/en/changelog.rst       |  2 ++
 src/_pytest/runner.py      |  4 ---
 testing/test_runner.py     | 50 --------------------------------------
 4 files changed, 3 insertions(+), 54 deletions(-)
 create mode 100644 changelog/12021.bugfix.rst

diff --git a/changelog/12021.bugfix.rst b/changelog/12021.bugfix.rst
new file mode 100644
index 00000000000..eb8771ad720
--- /dev/null
+++ b/changelog/12021.bugfix.rst
@@ -0,0 +1 @@
+Reverted a fix to `--maxfail` handling in pytest 8.0.0 because it caused a regression in pytest-xdist whereby session fixture teardowns may get executed multiple times when the max-fails is reached.
diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst
index f5019541ae3..2cdb04574ad 100644
--- a/doc/en/changelog.rst
+++ b/doc/en/changelog.rst
@@ -85,6 +85,8 @@ Bug Fixes
 
 - `#11706 <https://github.com/pytest-dev/pytest/issues/11706>`_: Fix reporting of teardown errors in higher-scoped fixtures when using `--maxfail` or `--stepwise`.
 
+  NOTE: This change was reverted in pytest 8.0.2 to fix a `regression <https://github.com/pytest-dev/pytest-xdist/issues/1024>`_ it caused in pytest-xdist.
+
 
 - `#11758 <https://github.com/pytest-dev/pytest/issues/11758>`_: Fixed ``IndexError: string index out of range`` crash in ``if highlighted[-1] == "\n" and source[-1] != "\n"``.
   This bug was introduced in pytest 8.0.0rc1.
diff --git a/src/_pytest/runner.py b/src/_pytest/runner.py
index 131b125ed59..5befb0af11c 100644
--- a/src/_pytest/runner.py
+++ b/src/_pytest/runner.py
@@ -132,10 +132,6 @@ def runtestprotocol(
             show_test_item(item)
         if not item.config.getoption("setuponly", False):
             reports.append(call_and_report(item, "call", log))
-    # If the session is about to fail or stop, teardown everything - this is
-    # necessary to correctly report fixture teardown errors (see #11706)
-    if item.session.shouldfail or item.session.shouldstop:
-        nextitem = None
     reports.append(call_and_report(item, "teardown", log, nextitem=nextitem))
     # After all teardown hooks have been called
     # want funcargs and request info to go away.
diff --git a/testing/test_runner.py b/testing/test_runner.py
index 769ce149234..d0fae834bcd 100644
--- a/testing/test_runner.py
+++ b/testing/test_runner.py
@@ -1088,53 +1088,3 @@ def func() -> None:
     with pytest.raises(TypeError) as excinfo:
         OutcomeException(func)  # type: ignore
     assert str(excinfo.value) == expected
-
-
-def test_teardown_session_failed(pytester: Pytester) -> None:
-    """Test that higher-scoped fixture teardowns run in the context of the last
-    item after the test session bails early due to --maxfail.
-
-    Regression test for #11706.
-    """
-    pytester.makepyfile(
-        """
-        import pytest
-
-        @pytest.fixture(scope="module")
-        def baz():
-            yield
-            pytest.fail("This is a failing teardown")
-
-        def test_foo(baz):
-            pytest.fail("This is a failing test")
-
-        def test_bar(): pass
-        """
-    )
-    result = pytester.runpytest("--maxfail=1")
-    result.assert_outcomes(failed=1, errors=1)
-
-
-def test_teardown_session_stopped(pytester: Pytester) -> None:
-    """Test that higher-scoped fixture teardowns run in the context of the last
-    item after the test session bails early due to --stepwise.
-
-    Regression test for #11706.
-    """
-    pytester.makepyfile(
-        """
-        import pytest
-
-        @pytest.fixture(scope="module")
-        def baz():
-            yield
-            pytest.fail("This is a failing teardown")
-
-        def test_foo(baz):
-            pytest.fail("This is a failing test")
-
-        def test_bar(): pass
-        """
-    )
-    result = pytester.runpytest("--stepwise")
-    result.assert_outcomes(failed=1, errors=1)