Make sure tracer is really uninstalled (handles situation where threads would still have tracer on).

Author: ionelmc

src/hunter/_event.c

@@ -32,6 +32,14 @@ cdef int trace_func(Tracer self, FrameType frame, int kind, PyObject *arg) excep
 
     handler = self.handler
 
+    if handler is None:  # the tracer was stopped
+        # make sure it's uninstalled even for running threads
+        if self.profiling_mode:
+            PyEval_SetProfile(NULL, NULL)
+        else:
+            PyEval_SetTrace(NULL, NULL)
+        return 0
+
     if kind == 3 and self.depth > 0:
         self.depth -= 1
 

src/hunter/_predicates.c

@@ -9,7 +9,7 @@ def on_postmortem():
     try:
         raise Exception("BOOM!")
     except Exception:
-        pdb.pm()
+        pdb.post_mortem()
 
 
 def on_settrace():
@@ -38,14 +38,16 @@ def on_debugger():
 if __name__ == '__main__':
     if sys.argv[1] == 'pdb':
         import pdb
+        from pdb import Pdb
     elif sys.argv[1] == 'ipdb':
         import ipdb as pdb
+        Pdb = lambda: pdb
 
     if sys.argv[2] == 'debugger':
-        with hunter.trace(source__has='Debugme!', action=hunter.Debugger(lambda: pdb)):
+        with hunter.trace(source__has='Debugme!', action=hunter.Debugger(Pdb)):
             on_debugger()
     else:
-        with hunter.trace():
+        with hunter.trace(module='samplepdb'):
             if sys.argv[2] == 'postmortem':
                 on_postmortem()
             elif sys.argv[2] == 'settrace':

src/hunter/_tracer.c

@@ -7,6 +7,9 @@
 from pprint import pprint
 
 import pytest
+from process_tests import TestProcess
+from process_tests import dump_on_error
+from process_tests import wait_for_strings
 
 from hunter import Backlog
 from hunter import CallPrinter
@@ -22,6 +25,7 @@
 from hunter import trace
 from hunter import wrap
 
+from utils import TIMEOUT
 from utils import DebugCallPrinter
 
 try:
@@ -763,3 +767,16 @@ def test_backlog_subprocess(LineMatcher):
         "depth=5 calls=16  *sample7args.py:34    line                     return i  # five",
         "depth=4 calls=16  *sample7args.py:34    return                <= five: 0",
     ])
+
+
+@pytest.mark.parametrize('pdb', ['pdb', 'ipdb'])
+@pytest.mark.parametrize('mode', ['postmortem', 'settrace', 'debugger'])
+def test_pdb(LineMatcher, pdb, mode):
+    with TestProcess('python', '-msamplepdb', pdb, mode, stdin=subprocess.PIPE) as target, dump_on_error(target.read):
+        wait_for_strings(target.read, TIMEOUT, '-> ')
+        target.proc.stdin.write('c\n')
+    output = target.read()
+    assert 'TypeError' not in output
+    assert "'NoneType' object is not callable" not in output
+    assert 'Disabling tracer because handler' not in output
+    assert 'Traceback (most recent call last)' not in output

src/hunter/_tracer.pyx

@@ -1,5 +1,4 @@
 import distutils.spawn
-import os
 import platform
 import signal
 import sys
@@ -9,7 +8,7 @@
 from process_tests import dump_on_error
 from process_tests import wait_for_strings
 
-TIMEOUT = int(os.getenv('HUNTER_TEST_TIMEOUT', 10))
+from utils import TIMEOUT
 
 platform, distutils.spawn
 

src/hunter/vendor/_cymem/cymem.c

@@ -1,5 +1,8 @@
+import os
+
 from hunter import CallPrinter
 
+TIMEOUT = int(os.getenv('HUNTER_TEST_TIMEOUT', 10))
 
 class DebugCallPrinter(CallPrinter):
     def __init__(self, suffix='', **kwargs):