#1269: fix a bug in pstats.add_callers() and add a unit test file for pstats.

This commit is contained in:
Georg Brandl 2008-01-21 10:24:59 +00:00
parent 2778c999e3
commit 66e7363c10
3 changed files with 31 additions and 1 deletions

View File

@ -512,7 +512,8 @@ def add_callers(target, source):
new_callers[func] = caller
for func, caller in source.iteritems():
if func in new_callers:
new_callers[func] = caller + new_callers[func]
new_callers[func] = tuple([i[0] + i[1] for i in
zip(caller, new_callers[func])])
else:
new_callers[func] = caller
return new_callers

26
Lib/test/test_pstats.py Normal file
View File

@ -0,0 +1,26 @@
import unittest
from test import test_support
import pstats
class AddCallersTestCase(unittest.TestCase):
"""Tests for pstats.add_callers helper."""
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."""
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)})
def test_main():
test_support.run_unittest(
AddCallersTestCase
)
if __name__ == "__main__":
test_main()

View File

@ -369,6 +369,9 @@ Core and builtins
Library
-------
- #1269: fix a bug in pstats.add_callers() and add a unit test file for
pstats.
- #1669: don't allow shutil.rmtree() to be called on a symlink to a
directory.