mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Add test.support.busy_retry() (#93770)
Add busy_retry() and sleeping_retry() functions to test.support.
This commit is contained in:
parent
4e9fa71d7e
commit
7e9eaad864
12 changed files with 186 additions and 99 deletions
|
@ -4313,18 +4313,13 @@ class _TestSharedMemory(BaseTestCase):
|
|||
p.terminate()
|
||||
p.wait()
|
||||
|
||||
deadline = time.monotonic() + support.LONG_TIMEOUT
|
||||
t = 0.1
|
||||
while time.monotonic() < deadline:
|
||||
time.sleep(t)
|
||||
t = min(t*2, 5)
|
||||
err_msg = ("A SharedMemory segment was leaked after "
|
||||
"a process was abruptly terminated")
|
||||
for _ in support.sleeping_retry(support.LONG_TIMEOUT, err_msg):
|
||||
try:
|
||||
smm = shared_memory.SharedMemory(name, create=False)
|
||||
except FileNotFoundError:
|
||||
break
|
||||
else:
|
||||
raise AssertionError("A SharedMemory segment was leaked after"
|
||||
" a process was abruptly terminated.")
|
||||
|
||||
if os.name == 'posix':
|
||||
# Without this line it was raising warnings like:
|
||||
|
@ -5334,9 +5329,10 @@ class TestResourceTracker(unittest.TestCase):
|
|||
p.terminate()
|
||||
p.wait()
|
||||
|
||||
deadline = time.monotonic() + support.LONG_TIMEOUT
|
||||
while time.monotonic() < deadline:
|
||||
time.sleep(.5)
|
||||
err_msg = (f"A {rtype} resource was leaked after a process was "
|
||||
f"abruptly terminated")
|
||||
for _ in support.sleeping_retry(support.SHORT_TIMEOUT,
|
||||
err_msg):
|
||||
try:
|
||||
_resource_unlink(name2, rtype)
|
||||
except OSError as e:
|
||||
|
@ -5344,10 +5340,7 @@ class TestResourceTracker(unittest.TestCase):
|
|||
# EINVAL
|
||||
self.assertIn(e.errno, (errno.ENOENT, errno.EINVAL))
|
||||
break
|
||||
else:
|
||||
raise AssertionError(
|
||||
f"A {rtype} resource was leaked after a process was "
|
||||
f"abruptly terminated.")
|
||||
|
||||
err = p.stderr.read().decode('utf-8')
|
||||
p.stderr.close()
|
||||
expected = ('resource_tracker: There appear to be 2 leaked {} '
|
||||
|
@ -5575,18 +5568,17 @@ class TestSyncManagerTypes(unittest.TestCase):
|
|||
# but this can take a bit on slow machines, so wait a few seconds
|
||||
# if there are other children too (see #17395).
|
||||
join_process(self.proc)
|
||||
|
||||
start_time = time.monotonic()
|
||||
t = 0.01
|
||||
while len(multiprocessing.active_children()) > 1:
|
||||
time.sleep(t)
|
||||
t *= 2
|
||||
dt = time.monotonic() - start_time
|
||||
if dt >= 5.0:
|
||||
test.support.environment_altered = True
|
||||
support.print_warning(f"multiprocessing.Manager still has "
|
||||
f"{multiprocessing.active_children()} "
|
||||
f"active children after {dt} seconds")
|
||||
for _ in support.sleeping_retry(5.0, error=False):
|
||||
if len(multiprocessing.active_children()) <= 1:
|
||||
break
|
||||
else:
|
||||
dt = time.monotonic() - start_time
|
||||
support.environment_altered = True
|
||||
support.print_warning(f"multiprocessing.Manager still has "
|
||||
f"{multiprocessing.active_children()} "
|
||||
f"active children after {dt:.1f} seconds")
|
||||
|
||||
def run_worker(self, worker, obj):
|
||||
self.proc = multiprocessing.Process(target=worker, args=(obj, ))
|
||||
|
@ -5884,17 +5876,15 @@ class ManagerMixin(BaseMixin):
|
|||
# but this can take a bit on slow machines, so wait a few seconds
|
||||
# if there are other children too (see #17395)
|
||||
start_time = time.monotonic()
|
||||
t = 0.01
|
||||
while len(multiprocessing.active_children()) > 1:
|
||||
time.sleep(t)
|
||||
t *= 2
|
||||
dt = time.monotonic() - start_time
|
||||
if dt >= 5.0:
|
||||
test.support.environment_altered = True
|
||||
support.print_warning(f"multiprocessing.Manager still has "
|
||||
f"{multiprocessing.active_children()} "
|
||||
f"active children after {dt} seconds")
|
||||
for _ in support.sleeping_retry(5.0, error=False):
|
||||
if len(multiprocessing.active_children()) <= 1:
|
||||
break
|
||||
else:
|
||||
dt = time.monotonic() - start_time
|
||||
support.environment_altered = True
|
||||
support.print_warning(f"multiprocessing.Manager still has "
|
||||
f"{multiprocessing.active_children()} "
|
||||
f"active children after {dt:.1f} seconds")
|
||||
|
||||
gc.collect() # do garbage collection
|
||||
if cls.manager._number_of_objects() != 0:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue