Merge pull request #5811 from blueyed/fulltrace-pytest-raises

Handle --fulltrace with pytest.raises

changelog/5811.bugfix.rst

@@ -0,0 +1 @@
+Handle ``--fulltrace`` correctly with ``pytest.raises``.

src/_pytest/nodes.py

@@ -245,15 +245,13 @@ def _repr_failure_py(self, excinfo, style=None):
         fm = self.session._fixturemanager
         if excinfo.errisinstance(fm.FixtureLookupError):
             return excinfo.value.formatrepr()
-        tbfilter = True
         if self.config.getoption("fulltrace", False):
             style = "long"
         else:
             tb = _pytest._code.Traceback([excinfo.traceback[-1]])
             self._prunetraceback(excinfo)
             if len(excinfo.traceback) == 0:
                 excinfo.traceback = tb
-            tbfilter = False  # prunetraceback already does it
             if style == "auto":
                 style = "long"
         # XXX should excinfo.getrepr record all data and toterminal() process it?
@@ -279,7 +277,7 @@ def _repr_failure_py(self, excinfo, style=None):
             abspath=abspath,
             showlocals=self.config.getoption("showlocals", False),
             style=style,
-            tbfilter=tbfilter,
+            tbfilter=False,  # pruned already, or in --fulltrace mode.
             truncate_locals=truncate_locals,
         )
 

testing/code/test_excinfo.py

@@ -399,6 +399,13 @@ def test_division_zero():
     result = testdir.runpytest()
     assert result.ret != 0
     result.stdout.fnmatch_lines(["*AssertionError*Pattern*[123]*not found*"])
+    assert "__tracebackhide__ = True" not in result.stdout.str()
+
+    result = testdir.runpytest("--fulltrace")
+    assert result.ret != 0
+    result.stdout.fnmatch_lines(
+        ["*__tracebackhide__ = True*", "*AssertionError*Pattern*[123]*not found*"]
+    )
 
 
 class TestFormattedExcinfo: