Skip to content

bpo-35513, unittest: TextTestRunner uses time.perf_counter() #11180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Lib/pprint.py
Original file line number Diff line number Diff line change
Expand Up @@ -568,11 +568,11 @@ def _perfcheck(object=None):
if object is None:
object = [("string", (1, 2), [3, 4], {5: 6, 7: 8})] * 100000
p = PrettyPrinter()
t1 = time.time()
t1 = time.perf_counter()
_safe_repr(object, {}, None, 0)
t2 = time.time()
t2 = time.perf_counter()
p.pformat(object)
t3 = time.time()
t3 = time.perf_counter()
print("_safe_repr:", t2 - t1)
print("pformat:", t3 - t2)

Expand Down
4 changes: 2 additions & 2 deletions Lib/random.py
Original file line number Diff line number Diff line change
Expand Up @@ -740,14 +740,14 @@ def _test_generator(n, func, args):
sqsum = 0.0
smallest = 1e10
largest = -1e10
t0 = time.time()
t0 = time.perf_counter()
for i in range(n):
x = func(*args)
total += x
sqsum = sqsum + x*x
smallest = min(x, smallest)
largest = max(x, largest)
t1 = time.time()
t1 = time.perf_counter()
print(round(t1-t0, 3), 'sec,', end=' ')
avg = total/n
stddev = _sqrt(sqsum/n - avg*avg)
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/libregrtest/runtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def runtest_inner(ns, test, display_failure=True):
abstest = get_abs_module(ns, test)
clear_caches()
with saved_test_environment(test, ns.verbose, ns.quiet, pgo=ns.pgo) as environment:
start_time = time.time()
start_time = time.perf_counter()
the_module = importlib.import_module(abstest)
# If the test has a test_main, that will run the appropriate
# tests. If not, use normal unittest test loading.
Expand All @@ -180,7 +180,7 @@ def test_runner():
refleak = dash_R(the_module, test, test_runner, ns.huntrleaks)
else:
test_runner()
test_time = time.time() - start_time
test_time = time.perf_counter() - start_time
post_test_cleanup()
except support.ResourceDenied as msg:
if not ns.quiet and not ns.pgo:
Expand Down
12 changes: 6 additions & 6 deletions Lib/test/time_hashlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@ def test_scaled_msg(scale, name):
longStr = b'Z'*scale

localCF = creatorFunc
start = time.time()
start = time.perf_counter()
for f in range(iterations):
x = localCF(longStr).digest()
end = time.time()
end = time.perf_counter()

print(('%2.2f' % (end-start)), "seconds", iterations, "x", len(longStr), "bytes", name)

def test_create():
start = time.time()
start = time.perf_counter()
for f in range(20000):
d = creatorFunc()
end = time.time()
end = time.perf_counter()

print(('%2.2f' % (end-start)), "seconds", '[20000 creations]')

def test_zero():
start = time.time()
start = time.perf_counter()
for f in range(20000):
x = creatorFunc().digest()
end = time.time()
end = time.perf_counter()

print(('%2.2f' % (end-start)), "seconds", '[20000 "" digests]')

Expand Down
4 changes: 2 additions & 2 deletions Lib/unittest/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def run(self, test):
warnings.filterwarnings('module',
category=DeprecationWarning,
message=r'Please use assert\w+ instead.')
startTime = time.time()
startTime = time.perf_counter()
startTestRun = getattr(result, 'startTestRun', None)
if startTestRun is not None:
startTestRun()
Expand All @@ -178,7 +178,7 @@ def run(self, test):
stopTestRun = getattr(result, 'stopTestRun', None)
if stopTestRun is not None:
stopTestRun()
stopTime = time.time()
stopTime = time.perf_counter()
timeTaken = stopTime - startTime
result.printErrors()
if hasattr(result, 'separator2'):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
:class:`~unittest.runner.TextTestRunner` of :mod:`unittest.runner` now uses
:func:`time.perf_counter` rather than :func:`time.time` to measure the
execution time of a test: :func:`time.time` can go backwards, whereas
:func:`time.perf_counter` is monotonic.