Add quick comment and improve CHANGELOG a bit

pytest-dev · Sep 13, 2019 · 1ac5267 · 1ac5267
1 parent 13b9107
commit 1ac5267
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/changelog/5811.bugfix.rst b/changelog/5811.bugfix.rst
@@ -1 +1 @@
-Handle --fulltrace with pytest.raises.
+Handle ``--fulltrace`` correctly with ``pytest.raises``.
diff --git a/src/_pytest/nodes.py b/src/_pytest/nodes.py
@@ -272,12 +272,15 @@ def _repr_failure_py(self, excinfo, style=None):
         except OSError:
             abspath = True
 
+        # traceback has been pruned at this point already if not in --fulltrace mode
+        tbfilter = False
+
         return excinfo.getrepr(
             funcargs=True,
             abspath=abspath,
             showlocals=self.config.getoption("showlocals", False),
             style=style,
-            tbfilter=False,
+            tbfilter=tbfilter,
             truncate_locals=truncate_locals,
         )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Handle --fulltrace with pytest.raises.
		Handle ``--fulltrace`` correctly with ``pytest.raises``.