traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-40275: Fix test.support.threading_helper (GH-20488) 

* Add missing sys import
* Get verbose and gc_collect() from test.support
* Remove unused starttime variable.

Issues spotted by pyflakes.
This commit is contained in:
Victor Stinner 2020-05-28 16:37:37 +02:00 committed by GitHub
parent 24bddc1b3b
commit 753643205a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/test/support/threading_helper.py
View File

@ -1,6 +1,7 @@
import _thread
import contextlib import contextlib
import functools import functools
import _thread import sys
import threading import threading
import time import time
@ -47,7 +48,7 @@ def threading_cleanup(*original_values):
values = None values = None
time.sleep(0.01) time.sleep(0.01)
gc_collect() support.gc_collect()
def reap_threads(func): def reap_threads(func):
@ -98,7 +99,7 @@ def wait_threads_exit(timeout=None):
f"(count: {count}, old count: {old_count})") f"(count: {count}, old count: {old_count})")
raise AssertionError(msg) raise AssertionError(msg)
time.sleep(0.010) time.sleep(0.010)
gc_collect() support.gc_collect()
def join_thread(thread, timeout=None): def join_thread(thread, timeout=None):
@ -124,7 +125,7 @@ def start_threads(threads, unlock=None):
t.start() t.start()
started.append(t) started.append(t)
except: except:
if verbose: if support.verbose:
print("Can't start %d threads, only %d threads started" % print("Can't start %d threads, only %d threads started" %
(len(threads), len(started))) (len(threads), len(started)))
raise raise
@ -133,7 +134,7 @@ def start_threads(threads, unlock=None):
try: try:
if unlock: if unlock:
unlock() unlock()
endtime = starttime = time.monotonic() endtime = time.monotonic()
for timeout in range(1, 16): for timeout in range(1, 16):
endtime += 60 endtime += 60
for t in started: for t in started:
@ -141,7 +142,7 @@ def start_threads(threads, unlock=None):
started = [t for t in started if t.is_alive()] started = [t for t in started if t.is_alive()]
if not started: if not started:
break break
if verbose: if support.verbose:
print('Unable to join %d threads during a period of ' print('Unable to join %d threads during a period of '
'%d minutes' % (len(started), timeout)) '%d minutes' % (len(started), timeout))
finally: finally: