[pypy-svn] pypy merge-stdlib-2.7.1: (antocuni, berdario) the output produced by pstats.py changed in 2.7.1, fix it. Also, change the name of the test to be more -k friendly

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: merge-stdlib-2.7.1
Changeset: r43676:a92b6ca951d7
Date: 2011-04-27 14:21 +0200
http://bitbucket.org/pypy/pypy/changeset/a92b6ca951d7/

Log:	(antocuni, berdario) the output produced by pstats.py changed in
	2.7.1, fix it. Also, change the name of the test to be more -k
	friendly

diff --git a/pypy/module/_lsprof/test/test_cprofile.py b/pypy/module/_lsprof/test/test_cprofile.py
--- a/pypy/module/_lsprof/test/test_cprofile.py
+++ b/pypy/module/_lsprof/test/test_cprofile.py
@@ -117,7 +117,7 @@
             assert 0.9 < subentry.totaltime < 2.9
             #assert 0.9 < subentry.inlinetime < 2.9
 
-    def test_cprofile(self):
+    def test_use_cprofile(self):
         import sys, os
         # XXX this is evil trickery to walk around the fact that we don't
         #     have __file__ at app-level here
@@ -187,7 +187,7 @@
 
 expected_output = {}
 expected_output['print_stats'] = """\
-         126 function calls (106 primitive calls) in 1.000 CPU seconds
+         126 function calls (106 primitive calls) in 1.000 seconds
 
    Ordered by: standard name