Handle quitting from pdb with --trace

Author: blueyed

src/_pytest/debugging.py

@@ -101,6 +101,10 @@ def do_continue(self, arg):
 
                 do_c = do_cont = do_continue
 
+                def set_quit(self):
+                    super(_PdbWrapper, self).set_quit()
+                    outcomes.exit("Quitting debugger")
+
                 def setup(self, f, tb):
                     """Suspend on setup().
 
@@ -122,6 +126,7 @@ def setup(self, f, tb):
 
         if set_break:
             _pdb.set_trace(frame)
+        return _pdb
 
 
 class PdbInvoke(object):
@@ -147,9 +152,9 @@ def pytest_pyfunc_call(self, pyfuncitem):
 
 
 def _test_pytest_function(pyfuncitem):
-    pytestPDB.set_trace(set_break=False)
+    _pdb = pytestPDB.set_trace(set_break=False)
     testfunction = pyfuncitem.obj
-    pyfuncitem.obj = pdb.runcall
+    pyfuncitem.obj = _pdb.runcall
     if pyfuncitem._isyieldedfunction():
         arg_list = list(pyfuncitem._args)
         arg_list.insert(0, testfunction)

testing/test_pdb.py

@@ -781,15 +781,26 @@ def test_trace_sets_breakpoint(self, testdir):
             """
             def test_1():
                 assert True
+
+            def test_2():
+                pass
+
+            def test_3():
+                pass
             """
         )
         child = testdir.spawn_pytest("--trace " + str(p1))
         child.expect("test_1")
         child.expect("Pdb")
-        child.sendeof()
+        child.sendline("c")
+        child.expect("test_2")
+        child.expect("Pdb")
+        child.sendline("q")
+        child.expect_exact("Exit: Quitting debugger")
         rest = child.read().decode("utf8")
-        assert "1 passed" in rest
+        assert "1 passed in" in rest
         assert "reading from stdin while output" not in rest
+        assert "Exit: Quitting debugger" in child.before.decode("utf8")
         TestPDB.flush(child)
 
     def test_trace_against_yield_test(self, testdir):