summaryrefslogtreecommitdiffstats
path: root/Lib/test/regrtest.py
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2013-08-29 11:51:11 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2013-08-29 11:51:11 (GMT)
commit83d7dea6aa32dfbfaaf9b314b604d68b162f5676 (patch)
treea703ecfcc7c24522e16dcaaa45f1461e286dfea3 /Lib/test/regrtest.py
parent968d05594e47e171a3e948d0001d22e0b92a2735 (diff)
downloadcpython-83d7dea6aa32dfbfaaf9b314b604d68b162f5676.zip
cpython-83d7dea6aa32dfbfaaf9b314b604d68b162f5676.tar.gz
cpython-83d7dea6aa32dfbfaaf9b314b604d68b162f5676.tar.bz2
Issue #8713: Cleanup before saving process._dangling.
Diffstat (limited to 'Lib/test/regrtest.py')
-rwxr-xr-xLib/test/regrtest.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index fab1764..03f168e 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1010,8 +1010,10 @@ class saved_test_environment:
'os.environ', 'sys.path', 'sys.path_hooks', '__import__',
'warnings.filters', 'asyncore.socket_map',
'logging._handlers', 'logging._handlerList', 'sys.gettrace',
- 'sys.warnoptions', 'threading._dangling',
- 'multiprocessing.process._dangling',
+ 'sys.warnoptions',
+ # multiprocessing.process._cleanup() may release ref
+ # to a thread, so check processes first.
+ 'multiprocessing.process._dangling', 'threading._dangling',
'sysconfig._CONFIG_VARS', 'sysconfig._INSTALL_SCHEMES',
'support.TESTFN', 'locale', 'warnings.showwarning',
)
@@ -1141,6 +1143,8 @@ class saved_test_environment:
def get_multiprocessing_process__dangling(self):
if not multiprocessing:
return None
+ # Unjoined process objects can survive after process exits
+ multiprocessing.process._cleanup()
# This copies the weakrefs without making any strong reference
return multiprocessing.process._dangling.copy()
def restore_multiprocessing_process__dangling(self, saved):