#11565: Merge with 3.2.

This commit is contained in:
Ezio Melotti 2011-03-16 11:38:59 +02:00
commit b88ed1549e
93 changed files with 124 additions and 124 deletions

View file

@ -578,7 +578,7 @@ class ThreadJoinOnShutdown(BaseTestCase):
# This acquires the lock and then waits until the child has forked
# before returning, which will release the lock soon after. If
# someone else tries to fix this test case by acquiring this lock
# before forking instead of reseting it, the test case will
# before forking instead of resetting it, the test case will
# deadlock when it shouldn't.
condition = w._block
orig_acquire = condition.acquire