Skip to content

Commit ea1803e

Browse files
authored
gh-88118: Fix some test_multiprocessing flakiness. (#116434)
Fix some test_multiprocessing flakiness. Potentially introduced by #25845 not joining that thread likely leads to recently observed "environment changed" logically passing but overall failing tests seen on some buildbots similar to: ``` 1 test altered the execution environment (env changed): test.test_multiprocessing_fork.test_processes 2 re-run tests: test.test_multiprocessing_fork.test_processes test.test_multiprocessing_forkserver.test_processes ```
1 parent c62144a commit ea1803e

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

Lib/test/_test_multiprocessing.py

+10-5
Original file line numberDiff line numberDiff line change
@@ -3513,15 +3513,20 @@ def run(addr, authkey):
35133513
client = self.connection.Client(addr, authkey=authkey)
35143514
client.send(1729)
35153515

3516-
key = b""
3516+
key = b''
35173517

35183518
with self.connection.Listener(authkey=key) as listener:
3519-
threading.Thread(target=run, args=(listener.address, key)).start()
3520-
with listener.accept() as d:
3521-
self.assertEqual(d.recv(), 1729)
3519+
thread = threading.Thread(target=run, args=(listener.address, key))
3520+
thread.start()
3521+
try:
3522+
with listener.accept() as d:
3523+
self.assertEqual(d.recv(), 1729)
3524+
finally:
3525+
thread.join()
35223526

35233527
if self.TYPE == 'processes':
3524-
self.assertRaises(OSError, listener.accept)
3528+
with self.assertRaises(OSError):
3529+
listener.accept()
35253530

35263531
@unittest.skipUnless(util.abstract_sockets_supported,
35273532
"test needs abstract socket support")

0 commit comments

Comments
 (0)