Merge master into features

1 files changed, 22 insertions, 0 deletions

diff --git a/testing/test_pytester.py b/testing/test_pytester.py
index 3dab13b4b..b747ac9ee 100644
--- a/testing/test_pytester.py
+++ b/testing/test_pytester.py
@@ -676,3 +676,25 @@ def test_run_result_repr():
         repr(r) == "<RunResult ret=99 len(stdout.lines)=3"
         " len(stderr.lines)=4 duration=0.50s>"
     )
+
+
+def test_testdir_outcomes_with_multiple_errors(testdir):
+    p1 = testdir.makepyfile(
+        """
+        import pytest
+
+        @pytest.fixture
+        def bad_fixture():
+            raise Exception("bad")
+
+        def test_error1(bad_fixture):
+            pass
+
+        def test_error2(bad_fixture):
+            pass
+    """
+    )
+    result = testdir.runpytest(str(p1))
+    result.assert_outcomes(error=2)
+
+    assert result.parseoutcomes() == {"error": 2}