Changeset 391 for python/trunk/Lib/test/test_profile.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_profile.py (modified) (3 diffs)

python/trunk/Lib/test/test_profile.py

@@ -1 +1 @@
 """Test suite for the profile module."""
 
-import os
 import sys
 import pstats
@@ -58 +57 @@
             stats.print_stats()
             res = s.getvalue()
-            self.assertTrue(self.expected_list_sort_output in res,
+            self.assertIn(self.expected_list_sort_output, res,
                 "Profiling {0!r} didn't report list.sort:\n{1}".format(stmt, res))
 
@@ -95 +94 @@
 #--cut--------------------------------------------------------------------------
 ProfileTest.expected_output['print_stats'] = """\
-         127 function calls (107 primitive calls) in 999.749 CPU seconds
+         127 function calls (107 primitive calls) in 999.749 seconds
 
    Ordered by: standard name