Bunch more tests.
diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py
index ee847b6..eca8c16 100644
--- a/Lib/test/test_trace.py
+++ b/Lib/test/test_trace.py
@@ -69,6 +69,62 @@
(3, 'line'),
(3, 'return')]
+def called(): # line -3
+ x = 1
+
+def call(): # line 0
+ called()
+
+call.events = [(0, 'call'),
+ (1, 'line'),
+ (-3, 'call'),
+ (-2, 'line'),
+ (-2, 'return'),
+ (1, 'return')]
+
+def raises():
+ raise Exception
+
+def test_raise():
+ try:
+ raises()
+ except Exception, exc:
+ x = 1
+
+test_raise.events = [(0, 'call'),
+ (1, 'line'),
+ (2, 'line'),
+ (-3, 'call'),
+ (-2, 'line'),
+ (-2, 'exception'),
+ (2, 'exception'),
+ (3, 'line'),
+ (4, 'line'),
+ (4, 'return')]
+
+def _settrace_and_return(tracefunc):
+ sys.settrace(tracefunc)
+ sys._getframe().f_back.f_trace = tracefunc
+def settrace_and_return(tracefunc):
+ _settrace_and_return(tracefunc)
+
+settrace_and_return.events = [(1, 'return')]
+
+def _settrace_and_raise(tracefunc):
+ sys.settrace(tracefunc)
+ sys._getframe().f_back.f_trace = tracefunc
+ raise RuntimeError
+def settrace_and_raise(tracefunc):
+ try:
+ _settrace_and_raise(tracefunc)
+ except RuntimeError, exc:
+ pass
+
+settrace_and_raise.events = [(2, 'exception'),
+ (3, 'line'),
+ (4, 'line'),
+ (4, 'return')]
+
class Tracer:
def __init__(self):
self.events = []
@@ -77,18 +133,29 @@
return self.trace
class TraceTestCase(unittest.TestCase):
+ def compare_events(self, line_offset, events, expected_events):
+ events = [(l - line_offset, e) for (l, e) in events]
+ if events != expected_events:
+ self.fail(
+ "events did not match expectation:\n" +
+ "\n".join(difflib.ndiff(map(str, expected_events),
+ map(str, events))))
+
+
def run_test(self, func):
tracer = Tracer()
sys.settrace(tracer.trace)
func()
sys.settrace(None)
- fl = func.func_code.co_firstlineno
- events = [(l - fl, e) for (l, e) in tracer.events]
- if events != func.events:
- self.fail(
- "events did not match expectation:\n" +
- "\n".join(difflib.ndiff(map(str, func.events),
- map(str, events))))
+ self.compare_events(func.func_code.co_firstlineno,
+ tracer.events, func.events)
+
+ def run_test2(self, func):
+ tracer = Tracer()
+ func(tracer.trace)
+ sys.settrace(None)
+ self.compare_events(func.func_code.co_firstlineno,
+ tracer.events, func.events)
def test_1_basic(self):
self.run_test(basic)
@@ -100,8 +167,15 @@
self.run_test(no_pop_blocks)
def test_5_no_pop_tops(self):
self.run_test(no_pop_tops)
-
-
+ def test_6_call(self):
+ self.run_test(call)
+ def test_7_raise(self):
+ self.run_test(test_raise)
+
+ def test_8_settrace_and_return(self):
+ self.run_test2(settrace_and_return)
+ def test_9_settrace_and_raise(self):
+ self.run_test2(settrace_and_raise)
def test_main():
test_support.run_unittest(TraceTestCase)