#7372: fix regression in pstats: a previous fix to handle cProfile data in add_callers broke handling of profile data.

This commit is contained in:
Georg Brandl 2010-08-02 17:24:49 +00:00
parent 790f831648
commit 2d3c4e79a1
3 changed files with 16 additions and 2 deletions

View file

@ -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():