[Python-checkins] r43031 - python/trunk/Lib/test/regrtest.py python/trunk/Lib/test/test_hashlib_speed.py python/trunk/Lib/test/time_hashlib.py
tim.peters
python-checkins at python.org
Tue Mar 14 23:48:58 CET 2006
Author: tim.peters
Date: Tue Mar 14 23:48:56 2006
New Revision: 43031
Added:
python/trunk/Lib/test/time_hashlib.py
- copied, changed from r43030, python/trunk/Lib/test/test_hashlib_speed.py
Removed:
python/trunk/Lib/test/test_hashlib_speed.py
Modified:
python/trunk/Lib/test/regrtest.py
Log:
Renamed test_hashlib_speed.py to time_hashlib.py.
Since it's never intended that this script be run by
regrtest.py, it shouldn't have been named with a "test_"
prefix to begin with. A consequence is that we shouldn't
see useless:
test_hashlib_speed skipped -- not a unit test (stand alone benchmark)
lines in regrtest output anymore.
Modified: python/trunk/Lib/test/regrtest.py
==============================================================================
--- python/trunk/Lib/test/regrtest.py (original)
+++ python/trunk/Lib/test/regrtest.py Tue Mar 14 23:48:56 2006
@@ -1136,9 +1136,6 @@
s = _expectations[sys.platform]
self.expected = set(s.split())
- # this isn't a regularly run unit test, it is always skipped
- self.expected.add('test_hashlib_speed')
-
if not os.path.supports_unicode_filenames:
self.expected.add('test_pep277')
Deleted: /python/trunk/Lib/test/test_hashlib_speed.py
==============================================================================
--- /python/trunk/Lib/test/test_hashlib_speed.py Tue Mar 14 23:48:56 2006
+++ (empty file)
@@ -1,92 +0,0 @@
-
-import sys, time
-import hashlib
-from test import test_support
-
-
-def creatorFunc():
- raise RuntimeError, "eek, creatorFunc not overridden"
-
-
-def test_scaled_msg(scale, name):
-
- iterations = 106201/scale * 20
- longStr = 'Z'*scale
-
- localCF = creatorFunc
- start = time.time()
- for f in xrange(iterations):
- x = localCF(longStr).digest()
- end = time.time()
-
- print ('%2.2f' % (end-start)), "seconds", iterations, "x", len(longStr), "bytes", name
-
-def test_create():
- start = time.time()
- for f in xrange(20000):
- d = creatorFunc()
- end = time.time()
-
- print ('%2.2f' % (end-start)), "seconds", '[20000 creations]'
-
-def test_zero():
- start = time.time()
- for f in xrange(20000):
- x = creatorFunc().digest()
- end = time.time()
-
- print ('%2.2f' % (end-start)), "seconds", '[20000 "" digests]'
-
-
-
-### this 'test' is not normally run. skip it if the test runner finds it
-if __name__ != '__main__':
- raise test_support.TestSkipped, "not a unit test (stand alone benchmark)"
-
-hName = sys.argv[1]
-
-#
-# setup our creatorFunc to test the requested hash
-#
-if hName in ('_md5', '_sha'):
- exec 'import '+hName
- exec 'creatorFunc = '+hName+'.new'
- print "testing speed of old", hName, "legacy interface"
-elif hName == '_hashlib' and len(sys.argv) > 3:
- import _hashlib
- exec 'creatorFunc = _hashlib.%s' % sys.argv[2]
- print "testing speed of _hashlib.%s" % sys.argv[2], getattr(_hashlib, sys.argv[2])
-elif hName == '_hashlib' and len(sys.argv) == 3:
- import _hashlib
- exec 'creatorFunc = lambda x=_hashlib.new : x(%r)' % sys.argv[2]
- print "testing speed of _hashlib.new(%r)" % sys.argv[2]
-elif hasattr(hashlib, hName) and callable(getattr(hashlib, hName)):
- creatorFunc = getattr(hashlib, hName)
- print "testing speed of hashlib."+hName, getattr(hashlib, hName)
-else:
- exec "creatorFunc = lambda x=hashlib.new : x(%r)" % hName
- print "testing speed of hashlib.new(%r)" % hName
-
-try:
- test_create()
-except ValueError:
- print
- print "pass argument(s) naming the hash to run a speed test on:"
- print " '_md5' and '_sha' test the legacy builtin md5 and sha"
- print " '_hashlib' 'openssl_hName' 'fast' tests the builtin _hashlib"
- print " '_hashlib' 'hName' tests builtin _hashlib.new(shaFOO)"
- print " 'hName' tests the hashlib.hName() implementation if it exists"
- print " otherwise it uses hashlib.new(hName)."
- print
- raise
-
-test_zero()
-test_scaled_msg(scale=106201, name='[huge data]')
-test_scaled_msg(scale=10620, name='[large data]')
-test_scaled_msg(scale=1062, name='[medium data]')
-test_scaled_msg(scale=424, name='[4*small data]')
-test_scaled_msg(scale=336, name='[3*small data]')
-test_scaled_msg(scale=212, name='[2*small data]')
-test_scaled_msg(scale=106, name='[small data]')
-test_scaled_msg(scale=creatorFunc().digest_size, name='[digest_size data]')
-test_scaled_msg(scale=10, name='[tiny data]')
Copied: python/trunk/Lib/test/time_hashlib.py (from r43030, python/trunk/Lib/test/test_hashlib_speed.py)
==============================================================================
--- python/trunk/Lib/test/test_hashlib_speed.py (original)
+++ python/trunk/Lib/test/time_hashlib.py Tue Mar 14 23:48:56 2006
@@ -1,15 +1,14 @@
+# It's intended that this script be run by hand. It runs speed tests on
+# hashlib functions; it does not test for correctness.
import sys, time
import hashlib
-from test import test_support
def creatorFunc():
raise RuntimeError, "eek, creatorFunc not overridden"
-
def test_scaled_msg(scale, name):
-
iterations = 106201/scale * 20
longStr = 'Z'*scale
@@ -39,10 +38,6 @@
-### this 'test' is not normally run. skip it if the test runner finds it
-if __name__ != '__main__':
- raise test_support.TestSkipped, "not a unit test (stand alone benchmark)"
-
hName = sys.argv[1]
#
More information about the Python-checkins
mailing list