From 2d3c4e79a19d8052d756575775a643a7107dced7 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 2 Aug 2010 17:24:49 +0000 Subject: #7372: fix regression in pstats: a previous fix to handle cProfile data in add_callers broke handling of profile data. --- Lib/test/test_pstats.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Lib/test/test_pstats.py') diff --git a/Lib/test/test_pstats.py b/Lib/test/test_pstats.py index 095123d881..7c28465c3b 100644 --- a/Lib/test/test_pstats.py +++ b/Lib/test/test_pstats.py @@ -10,10 +10,16 @@ class AddCallersTestCase(unittest.TestCase): def test_combine_results(self): """pstats.add_callers should combine the call results of both target and source by adding the call time. See issue1269.""" + # new format: used by the cProfile module target = {"a": (1, 2, 3, 4)} source = {"a": (1, 2, 3, 4), "b": (5, 6, 7, 8)} new_callers = pstats.add_callers(target, source) self.assertEqual(new_callers, {'a': (2, 4, 6, 8), 'b': (5, 6, 7, 8)}) + # old format: used by the profile module + target = {"a": 1} + source = {"a": 1, "b": 5} + new_callers = pstats.add_callers(target, source) + self.assertEqual(new_callers, {'a': 2, 'b': 5}) def test_main(): -- cgit v1.2.1