[Python-checkins] r60529 - in python/trunk/Lib/test: output/test_cProfile test_cProfile.py test_cprofile.py
georg.brandl
python-checkins at python.org
Sat Feb 2 12:46:08 CET 2008
Author: georg.brandl
Date: Sat Feb 2 12:46:07 2008
New Revision: 60529
Added:
python/trunk/Lib/test/test_cprofile.py
- copied, changed from r60520, python/trunk/Lib/test/test_cProfile.py
Removed:
python/trunk/Lib/test/output/test_cProfile
python/trunk/Lib/test/test_cProfile.py
Log:
Rewrite test_cprofile as unittest (and rename the file to be consistent
with all other test files). Written for GHOP by Benjamin Peterson.
Deleted: /python/trunk/Lib/test/output/test_cProfile
==============================================================================
--- /python/trunk/Lib/test/output/test_cProfile Sat Feb 2 12:46:07 2008
+++ (empty file)
@@ -1,79 +0,0 @@
-test_cProfile
- 126 function calls (106 primitive calls) in 1.000 CPU seconds
-
- Ordered by: standard name
-
- ncalls tottime percall cumtime percall filename:lineno(function)
- 1 0.000 0.000 1.000 1.000 <string>:1(<module>)
- 8 0.064 0.008 0.080 0.010 test_cProfile.py:103(subhelper)
- 28 0.028 0.001 0.028 0.001 test_cProfile.py:115(__getattr__)
- 1 0.270 0.270 1.000 1.000 test_cProfile.py:30(testfunc)
- 23/3 0.150 0.007 0.170 0.057 test_cProfile.py:40(factorial)
- 20 0.020 0.001 0.020 0.001 test_cProfile.py:53(mul)
- 2 0.040 0.020 0.600 0.300 test_cProfile.py:60(helper)
- 4 0.116 0.029 0.120 0.030 test_cProfile.py:78(helper1)
- 2 0.000 0.000 0.140 0.070 test_cProfile.py:89(helper2_indirect)
- 8 0.312 0.039 0.400 0.050 test_cProfile.py:93(helper2)
- 12 0.000 0.000 0.012 0.001 {hasattr}
- 4 0.000 0.000 0.000 0.000 {method 'append' of 'list' objects}
- 1 0.000 0.000 0.000 0.000 {method 'disable' of '_lsprof.Profiler' objects}
- 8 0.000 0.000 0.000 0.000 {range}
- 4 0.000 0.000 0.000 0.000 {sys.exc_info}
-
-
- Ordered by: standard name
-
-Function called...
- ncalls tottime cumtime
-<string>:1(<module>) -> 1 0.270 1.000 test_cProfile.py:30(testfunc)
-test_cProfile.py:103(subhelper) -> 16 0.016 0.016 test_cProfile.py:115(__getattr__)
- 8 0.000 0.000 {range}
-test_cProfile.py:115(__getattr__) ->
-test_cProfile.py:30(testfunc) -> 1 0.014 0.130 test_cProfile.py:40(factorial)
- 2 0.040 0.600 test_cProfile.py:60(helper)
-test_cProfile.py:40(factorial) -> 20/3 0.130 0.147 test_cProfile.py:40(factorial)
- 20 0.020 0.020 test_cProfile.py:53(mul)
-test_cProfile.py:53(mul) ->
-test_cProfile.py:60(helper) -> 4 0.116 0.120 test_cProfile.py:78(helper1)
- 2 0.000 0.140 test_cProfile.py:89(helper2_indirect)
- 6 0.234 0.300 test_cProfile.py:93(helper2)
-test_cProfile.py:78(helper1) -> 4 0.000 0.004 {hasattr}
- 4 0.000 0.000 {method 'append' of 'list' objects}
- 4 0.000 0.000 {sys.exc_info}
-test_cProfile.py:89(helper2_indirect) -> 2 0.006 0.040 test_cProfile.py:40(factorial)
- 2 0.078 0.100 test_cProfile.py:93(helper2)
-test_cProfile.py:93(helper2) -> 8 0.064 0.080 test_cProfile.py:103(subhelper)
- 8 0.000 0.008 {hasattr}
-{hasattr} -> 12 0.012 0.012 test_cProfile.py:115(__getattr__)
-{method 'append' of 'list' objects} ->
-{method 'disable' of '_lsprof.Profiler' objects} ->
-{range} ->
-{sys.exc_info} ->
-
-
- Ordered by: standard name
-
-Function was called by...
- ncalls tottime cumtime
-<string>:1(<module>) <-
-test_cProfile.py:103(subhelper) <- 8 0.064 0.080 test_cProfile.py:93(helper2)
-test_cProfile.py:115(__getattr__) <- 16 0.016 0.016 test_cProfile.py:103(subhelper)
- 12 0.012 0.012 {hasattr}
-test_cProfile.py:30(testfunc) <- 1 0.270 1.000 <string>:1(<module>)
-test_cProfile.py:40(factorial) <- 1 0.014 0.130 test_cProfile.py:30(testfunc)
- 20/3 0.130 0.147 test_cProfile.py:40(factorial)
- 2 0.006 0.040 test_cProfile.py:89(helper2_indirect)
-test_cProfile.py:53(mul) <- 20 0.020 0.020 test_cProfile.py:40(factorial)
-test_cProfile.py:60(helper) <- 2 0.040 0.600 test_cProfile.py:30(testfunc)
-test_cProfile.py:78(helper1) <- 4 0.116 0.120 test_cProfile.py:60(helper)
-test_cProfile.py:89(helper2_indirect) <- 2 0.000 0.140 test_cProfile.py:60(helper)
-test_cProfile.py:93(helper2) <- 6 0.234 0.300 test_cProfile.py:60(helper)
- 2 0.078 0.100 test_cProfile.py:89(helper2_indirect)
-{hasattr} <- 4 0.000 0.004 test_cProfile.py:78(helper1)
- 8 0.000 0.008 test_cProfile.py:93(helper2)
-{method 'append' of 'list' objects} <- 4 0.000 0.000 test_cProfile.py:78(helper1)
-{method 'disable' of '_lsprof.Profiler' objects} <-
-{range} <- 8 0.000 0.000 test_cProfile.py:103(subhelper)
-{sys.exc_info} <- 4 0.000 0.000 test_cProfile.py:78(helper1)
-
-
Deleted: /python/trunk/Lib/test/test_cProfile.py
==============================================================================
--- /python/trunk/Lib/test/test_cProfile.py Sat Feb 2 12:46:07 2008
+++ (empty file)
@@ -1,123 +0,0 @@
-"""Test suite for the cProfile module."""
-
-import cProfile, pstats, sys
-
-# In order to have reproducible time, we simulate a timer in the global
-# variable 'ticks', which represents simulated time in milliseconds.
-# (We can't use a helper function increment the timer since it would be
-# included in the profile and would appear to consume all the time.)
-ticks = 0
-
-# IMPORTANT: this is an output test. *ALL* NUMBERS in the expected
-# output are relevant. If you change the formatting of pstats,
-# please don't just regenerate output/test_cProfile without checking
-# very carefully that not a single number has changed.
-
-def test_main():
- global ticks
- ticks = 42000
- prof = cProfile.Profile(timer, 0.001)
- prof.runctx("testfunc()", globals(), locals())
- assert ticks == 43000, ticks
- st = pstats.Stats(prof)
- st.strip_dirs().sort_stats('stdname').print_stats()
- st.print_callees()
- st.print_callers()
-
-def timer():
- return ticks
-
-def testfunc():
- # 1 call
- # 1000 ticks total: 270 ticks local, 730 ticks in subfunctions
- global ticks
- ticks += 99
- helper() # 300
- helper() # 300
- ticks += 171
- factorial(14) # 130
-
-def factorial(n):
- # 23 calls total
- # 170 ticks total, 150 ticks local
- # 3 primitive calls, 130, 20 and 20 ticks total
- # including 116, 17, 17 ticks local
- global ticks
- if n > 0:
- ticks += n
- return mul(n, factorial(n-1))
- else:
- ticks += 11
- return 1
-
-def mul(a, b):
- # 20 calls
- # 1 tick, local
- global ticks
- ticks += 1
- return a * b
-
-def helper():
- # 2 calls
- # 300 ticks total: 20 ticks local, 260 ticks in subfunctions
- global ticks
- ticks += 1
- helper1() # 30
- ticks += 2
- helper1() # 30
- ticks += 6
- helper2() # 50
- ticks += 3
- helper2() # 50
- ticks += 2
- helper2() # 50
- ticks += 5
- helper2_indirect() # 70
- ticks += 1
-
-def helper1():
- # 4 calls
- # 30 ticks total: 29 ticks local, 1 tick in subfunctions
- global ticks
- ticks += 10
- hasattr(C(), "foo") # 1
- ticks += 19
- lst = []
- lst.append(42) # 0
- sys.exc_info() # 0
-
-def helper2_indirect():
- helper2() # 50
- factorial(3) # 20
-
-def helper2():
- # 8 calls
- # 50 ticks local: 39 ticks local, 11 ticks in subfunctions
- global ticks
- ticks += 11
- hasattr(C(), "bar") # 1
- ticks += 13
- subhelper() # 10
- ticks += 15
-
-def subhelper():
- # 8 calls
- # 10 ticks total: 8 ticks local, 2 ticks in subfunctions
- global ticks
- ticks += 2
- for i in range(2): # 0
- try:
- C().foo # 1 x 2
- except AttributeError:
- ticks += 3 # 3 x 2
-
-class C:
- def __getattr__(self, name):
- # 28 calls
- # 1 tick, local
- global ticks
- ticks += 1
- raise AttributeError
-
-if __name__ == "__main__":
- test_main()
Copied: python/trunk/Lib/test/test_cprofile.py (from r60520, python/trunk/Lib/test/test_cProfile.py)
==============================================================================
--- python/trunk/Lib/test/test_cProfile.py (original)
+++ python/trunk/Lib/test/test_cprofile.py Sat Feb 2 12:46:07 2008
@@ -1,40 +1,27 @@
-"""Test suite for the cProfile module."""
+import sys
+import cProfile
+import pstats
+import test.test_support
+
+#################################
+# Warning!
+# This stuff is touchy. If you modify anything above the test_main function,
+# you'll have to regenerate the stats for the doctest!
+################################
-import cProfile, pstats, sys
-
-# In order to have reproducible time, we simulate a timer in the global
-# variable 'ticks', which represents simulated time in milliseconds.
-# (We can't use a helper function increment the timer since it would be
-# included in the profile and would appear to consume all the time.)
-ticks = 0
-
-# IMPORTANT: this is an output test. *ALL* NUMBERS in the expected
-# output are relevant. If you change the formatting of pstats,
-# please don't just regenerate output/test_cProfile without checking
-# very carefully that not a single number has changed.
-
-def test_main():
- global ticks
- ticks = 42000
- prof = cProfile.Profile(timer, 0.001)
- prof.runctx("testfunc()", globals(), locals())
- assert ticks == 43000, ticks
- st = pstats.Stats(prof)
- st.strip_dirs().sort_stats('stdname').print_stats()
- st.print_callees()
- st.print_callers()
+TICKS = 42000
def timer():
- return ticks
+ return TICKS
def testfunc():
# 1 call
# 1000 ticks total: 270 ticks local, 730 ticks in subfunctions
- global ticks
- ticks += 99
+ global TICKS
+ TICKS += 99
helper() # 300
helper() # 300
- ticks += 171
+ TICKS += 171
factorial(14) # 130
def factorial(n):
@@ -42,46 +29,46 @@
# 170 ticks total, 150 ticks local
# 3 primitive calls, 130, 20 and 20 ticks total
# including 116, 17, 17 ticks local
- global ticks
+ global TICKS
if n > 0:
- ticks += n
+ TICKS += n
return mul(n, factorial(n-1))
else:
- ticks += 11
+ TICKS += 11
return 1
def mul(a, b):
# 20 calls
# 1 tick, local
- global ticks
- ticks += 1
+ global TICKS
+ TICKS += 1
return a * b
def helper():
# 2 calls
# 300 ticks total: 20 ticks local, 260 ticks in subfunctions
- global ticks
- ticks += 1
+ global TICKS
+ TICKS += 1
helper1() # 30
- ticks += 2
+ TICKS += 2
helper1() # 30
- ticks += 6
+ TICKS += 6
helper2() # 50
- ticks += 3
+ TICKS += 3
helper2() # 50
- ticks += 2
+ TICKS += 2
helper2() # 50
- ticks += 5
+ TICKS += 5
helper2_indirect() # 70
- ticks += 1
+ TICKS += 1
def helper1():
# 4 calls
# 30 ticks total: 29 ticks local, 1 tick in subfunctions
- global ticks
- ticks += 10
+ global TICKS
+ TICKS += 10
hasattr(C(), "foo") # 1
- ticks += 19
+ TICKS += 19
lst = []
lst.append(42) # 0
sys.exc_info() # 0
@@ -93,31 +80,129 @@
def helper2():
# 8 calls
# 50 ticks local: 39 ticks local, 11 ticks in subfunctions
- global ticks
- ticks += 11
+ global TICKS
+ TICKS += 11
hasattr(C(), "bar") # 1
- ticks += 13
+ TICKS += 13
subhelper() # 10
- ticks += 15
+ TICKS += 15
def subhelper():
# 8 calls
# 10 ticks total: 8 ticks local, 2 ticks in subfunctions
- global ticks
- ticks += 2
+ global TICKS
+ TICKS += 2
for i in range(2): # 0
try:
C().foo # 1 x 2
except AttributeError:
- ticks += 3 # 3 x 2
+ TICKS += 3 # 3 x 2
class C:
def __getattr__(self, name):
# 28 calls
# 1 tick, local
- global ticks
- ticks += 1
+ global TICKS
+ TICKS += 1
raise AttributeError
+def test_main():
+ """
+ >>> prof = cProfile.Profile(timer, 0.001)
+ >>> prof.runctx("testfunc()", globals(), locals()) #doctest: +ELLIPSIS
+ <cProfile.Profile object at ...>
+ >>> timer()
+ 43000
+ >>> stats = pstats.Stats(prof)
+ >>> stats.strip_dirs().sort_stats("stdname") #doctest: +ELLIPSIS
+ <pstats.Stats ...>
+ >>> stats.print_stats() #doctest: +ELLIPSIS
+ 126 function calls (106 primitive calls) in 1.000 CPU seconds
+ <BLANKLINE>
+ Ordered by: standard name
+ <BLANKLINE>
+ ncalls tottime percall cumtime percall filename:lineno(function)
+ 1 0.000 0.000 1.000 1.000 <string>:1(<module>)
+ 28 0.028 0.001 0.028 0.001 test_cprofile.py:102(__getattr__)
+ 1 0.270 0.270 1.000 1.000 test_cprofile.py:17(testfunc)
+ 23/3 0.150 0.007 0.170 0.057 test_cprofile.py:27(factorial)
+ 20 0.020 0.001 0.020 0.001 test_cprofile.py:40(mul)
+ 2 0.040 0.020 0.600 0.300 test_cprofile.py:47(helper)
+ 4 0.116 0.029 0.120 0.030 test_cprofile.py:65(helper1)
+ 2 0.000 0.000 0.140 0.070 test_cprofile.py:76(helper2_indirect)
+ 8 0.312 0.039 0.400 0.050 test_cprofile.py:80(helper2)
+ 8 0.064 0.008 0.080 0.010 test_cprofile.py:90(subhelper)
+ 12 0.000 0.000 0.012 0.001 {hasattr}
+ 4 0.000 0.000 0.000 0.000 {method 'append' of 'list' objects}
+ 1 0.000 0.000 0.000 0.000 {method 'disable' of '_lsprof.Profiler' objects}
+ 8 0.000 0.000 0.000 0.000 {range}
+ 4 0.000 0.000 0.000 0.000 {sys.exc_info}
+ <BLANKLINE>
+ <BLANKLINE>
+ <pstats.Stats instance at ...>
+ >>> stats.print_callers() #doctest: +ELLIPSIS
+ Ordered by: standard name
+ <BLANKLINE>
+ Function was called by...
+ ncalls tottime cumtime
+ <string>:1(<module>) <-
+ test_cprofile.py:102(__getattr__) <- 16 0.016 0.016 test_cprofile.py:90(subhelper)
+ 12 0.012 0.012 {hasattr}
+ test_cprofile.py:17(testfunc) <- 1 0.270 1.000 <string>:1(<module>)
+ test_cprofile.py:27(factorial) <- 1 0.014 0.130 test_cprofile.py:17(testfunc)
+ 20/3 0.130 0.147 test_cprofile.py:27(factorial)
+ 2 0.006 0.040 test_cprofile.py:76(helper2_indirect)
+ test_cprofile.py:40(mul) <- 20 0.020 0.020 test_cprofile.py:27(factorial)
+ test_cprofile.py:47(helper) <- 2 0.040 0.600 test_cprofile.py:17(testfunc)
+ test_cprofile.py:65(helper1) <- 4 0.116 0.120 test_cprofile.py:47(helper)
+ test_cprofile.py:76(helper2_indirect) <- 2 0.000 0.140 test_cprofile.py:47(helper)
+ test_cprofile.py:80(helper2) <- 6 0.234 0.300 test_cprofile.py:47(helper)
+ 2 0.078 0.100 test_cprofile.py:76(helper2_indirect)
+ test_cprofile.py:90(subhelper) <- 8 0.064 0.080 test_cprofile.py:80(helper2)
+ {hasattr} <- 4 0.000 0.004 test_cprofile.py:65(helper1)
+ 8 0.000 0.008 test_cprofile.py:80(helper2)
+ {method 'append' of 'list' objects} <- 4 0.000 0.000 test_cprofile.py:65(helper1)
+ {method 'disable' of '_lsprof.Profiler' objects} <-
+ {range} <- 8 0.000 0.000 test_cprofile.py:90(subhelper)
+ {sys.exc_info} <- 4 0.000 0.000 test_cprofile.py:65(helper1)
+ <BLANKLINE>
+ <BLANKLINE>
+ <pstats.Stats instance at ...>
+ >>> stats.print_callees() #doctest: +ELLIPSIS
+ Ordered by: standard name
+ <BLANKLINE>
+ Function called...
+ ncalls tottime cumtime
+ <string>:1(<module>) -> 1 0.270 1.000 test_cprofile.py:17(testfunc)
+ test_cprofile.py:102(__getattr__) ->
+ test_cprofile.py:17(testfunc) -> 1 0.014 0.130 test_cprofile.py:27(factorial)
+ 2 0.040 0.600 test_cprofile.py:47(helper)
+ test_cprofile.py:27(factorial) -> 20/3 0.130 0.147 test_cprofile.py:27(factorial)
+ 20 0.020 0.020 test_cprofile.py:40(mul)
+ test_cprofile.py:40(mul) ->
+ test_cprofile.py:47(helper) -> 4 0.116 0.120 test_cprofile.py:65(helper1)
+ 2 0.000 0.140 test_cprofile.py:76(helper2_indirect)
+ 6 0.234 0.300 test_cprofile.py:80(helper2)
+ test_cprofile.py:65(helper1) -> 4 0.000 0.004 {hasattr}
+ 4 0.000 0.000 {method 'append' of 'list' objects}
+ 4 0.000 0.000 {sys.exc_info}
+ test_cprofile.py:76(helper2_indirect) -> 2 0.006 0.040 test_cprofile.py:27(factorial)
+ 2 0.078 0.100 test_cprofile.py:80(helper2)
+ test_cprofile.py:80(helper2) -> 8 0.064 0.080 test_cprofile.py:90(subhelper)
+ 8 0.000 0.008 {hasattr}
+ test_cprofile.py:90(subhelper) -> 16 0.016 0.016 test_cprofile.py:102(__getattr__)
+ 8 0.000 0.000 {range}
+ {hasattr} -> 12 0.012 0.012 test_cprofile.py:102(__getattr__)
+ {method 'append' of 'list' objects} ->
+ {method 'disable' of '_lsprof.Profiler' objects} ->
+ {range} ->
+ {sys.exc_info} ->
+ <BLANKLINE>
+ <BLANKLINE>
+ <pstats.Stats instance at ...>
+ """
+ from test import test_cprofile
+ test.test_support.run_doctest(test_cprofile)
+
if __name__ == "__main__":
test_main()
More information about the Python-checkins
mailing list