Merge branch 'stdout-pdb-capture'

AUTHORS

@@ -73,3 +73,4 @@ Simon Gomizelj
 Russel Winder
 Ben Webb
 Alexei Kozlenok
+Cal Leeming

CHANGELOG

@@ -15,6 +15,10 @@
 - fix #1292: monkeypatch calls (setattr, setenv, etc.) are now O(1).
   Thanks David R. MacIver for the report and Bruno Oliveira for the PR.
 
+- fix #1223: captured stdout and stderr are now properly displayed before 
+  entering pdb when ``--pdb`` is used instead of being thrown away.
+  Thanks Cal Leeming for the PR.
+
 - fix #1305: pytest warnings emitted during ``pytest_terminal_summary`` are now
   properly displayed.
   Thanks Ionel Maries Cristian for the report and Bruno Oliveira for the PR.

_pytest/pdb.py

@@ -53,7 +53,9 @@ class PdbInvoke:
     def pytest_exception_interact(self, node, call, report):
         capman = node.config.pluginmanager.getplugin("capturemanager")
         if capman:
-            capman.suspendcapture(in_=True)
+            out, err = capman.suspendcapture(in_=True)
+            sys.stdout.write(out)
+            sys.stdout.write(err)
         _enter_pdb(node, call.excinfo, report)
 
     def pytest_internalerror(self, excrepr, excinfo):

testing/test_pdb.py

@@ -75,6 +75,22 @@ class TestPDB:
         if child.isalive():
             child.wait()
 
+    def test_pdb_interaction_capture(self, testdir):
+        p1 = testdir.makepyfile("""
+            def test_1():
+                print("getrekt")
+                assert False
+        """)
+        child = testdir.spawn_pytest("--pdb %s" % p1)
+        child.expect("getrekt")
+        child.expect("(Pdb)")
+        child.sendeof()
+        rest = child.read().decode("utf8")
+        assert "1 failed" in rest
+        assert "getrekt" not in rest
+        if child.isalive():
+            child.wait()
+
     def test_pdb_interaction_exception(self, testdir):
         p1 = testdir.makepyfile("""
             import pytest