mirror of https://github.com/python/cpython.git
Merge.
This commit is contained in:
commit
e410f267f1
|
@ -3590,14 +3590,17 @@ def setUpModule():
|
||||||
try:
|
try:
|
||||||
lock = multiprocessing.RLock()
|
lock = multiprocessing.RLock()
|
||||||
except OSError:
|
except OSError:
|
||||||
raise unittest.SkipTest("OSError raises on RLock creation, see issue 3111!")
|
raise unittest.SkipTest("OSError raises on RLock creation, "
|
||||||
|
"see issue 3111!")
|
||||||
check_enough_semaphores()
|
check_enough_semaphores()
|
||||||
|
|
||||||
util.get_temp_dir() # creates temp directory for use by all processes
|
util.get_temp_dir() # creates temp directory for use by all processes
|
||||||
|
|
||||||
multiprocessing.get_logger().setLevel(LOG_LEVEL)
|
multiprocessing.get_logger().setLevel(LOG_LEVEL)
|
||||||
|
|
||||||
|
|
||||||
|
def tearDownModule():
|
||||||
|
# pause a bit so we don't get warning about dangling threads/processes
|
||||||
|
time.sleep(0.5)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|
Loading…
Reference in New Issue