Changeset 391 for python/trunk/Lib/test/test_hotshot.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_hotshot.py (modified) (5 diffs)

python/trunk/Lib/test/test_hotshot.py

@@ -1 @@
-import hotshot
-import hotshot.log
 import os
 import pprint
@@ -10 +8 @@
 from test import test_support
 
+# Silence Py3k warning
+hotshot = test_support.import_module('hotshot', deprecated=True)
 from hotshot.log import ENTER, EXIT, LINE
+from hotshot import stats
 
 
@@ -65 +66 @@
         if profiler is None:
             profiler = self.new_profiler()
-        self.failUnless(not profiler._prof.closed)
+        self.assertTrue(not profiler._prof.closed)
         profiler.runcall(callable)
-        self.failUnless(not profiler._prof.closed)
+        self.assertTrue(not profiler._prof.closed)
         profiler.close()
-        self.failUnless(profiler._prof.closed)
+        self.assertTrue(profiler._prof.closed)
         self.check_events(events)
 
@@ -81 +82 @@
         info = log._info
         list(log)
-        self.failUnless(info["test-key"] == ["test-value"])
+        self.assertTrue(info["test-key"] == ["test-value"])
 
     def test_line_numbers(self):
@@ -137 +138 @@
         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)