summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_multiprocessing.py
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2012-06-15 19:08:29 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2012-06-15 19:08:29 (GMT)
commit3049f1243ec85590f64962994f055da66c85a15e (patch)
tree5b97ba94f26319cf3f9b0b6b9811d48e9c621503 /Lib/test/test_multiprocessing.py
parent0f52346e760648a83504b1babd2a530f802eb096 (diff)
downloadcpython-3049f1243ec85590f64962994f055da66c85a15e.zip
cpython-3049f1243ec85590f64962994f055da66c85a15e.tar.gz
cpython-3049f1243ec85590f64962994f055da66c85a15e.tar.bz2
Increase timeout used when waiting for manager to shutdown cleanly
before resorting to terminate()
Diffstat (limited to 'Lib/test/test_multiprocessing.py')
-rw-r--r--Lib/test/test_multiprocessing.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index e4031f6..d79110a 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -1820,6 +1820,11 @@ class _TestZZZNumberOfObjects(BaseTestCase):
# run after all the other tests for the manager. It tests that
# there have been no "reference leaks" for the manager's shared
# objects. Note the comment in _TestPool.test_terminate().
+
+ # If some other test using ManagerMixin.manager fails, then the
+ # raised exception may keep alive a frame which holds a reference
+ # to a managed object. This will cause test_number_of_objects to
+ # also fail.
ALLOWED_TYPES = ('manager',)
def test_number_of_objects(self):