Merged revisions 83354,83365 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
........
r83354 | georg.brandl | 2010-07-31 21:07:37 +0200 (Sa, 31 Jul 2010) | 1 line
#9328: string format methods return strings.
........
r83365 | georg.brandl | 2010-07-31 23:22:36 +0200 (Sa, 31 Jul 2010) | 1 line
#1019882: if start() and stop() were not in the same stack frame, stats.load() would crash with IndexError.
........
diff --git a/Lib/test/test_hotshot.py b/Lib/test/test_hotshot.py
index fa6b2f1..bc499bb 100644
--- a/Lib/test/test_hotshot.py
+++ b/Lib/test/test_hotshot.py
@@ -10,6 +10,7 @@
from test import test_support
from hotshot.log import ENTER, EXIT, LINE
+from hotshot import stats
def shortfilename(fn):
@@ -136,6 +137,19 @@
emptyfile.close()
gc.collect()
+ def test_load_stats(self):
+ def start(prof):
+ prof.start()
+ # Make sure stats can be loaded when start and stop of profiler
+ # are not executed in the same stack frame.
+ profiler = self.new_profiler()
+ start(profiler)
+ profiler.stop()
+ profiler.close()
+ stats.load(self.logfn)
+ os.unlink(self.logfn)
+
+
def test_main():
test_support.run_unittest(HotShotTestCase)