summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2006-06-26 17:00:35 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2006-06-26 17:00:35 (GMT)
commit15486f78f0ccb04b86905b175c004a5b4c4f785e (patch)
treebcc64edf200f883e9af414c0a4d8922e032b9638 /Lib/test
parentec3c368195c66d2ed044e4de713824c64e05694d (diff)
downloadcpython-15486f78f0ccb04b86905b175c004a5b4c4f785e.zip
cpython-15486f78f0ccb04b86905b175c004a5b4c4f785e.tar.gz
cpython-15486f78f0ccb04b86905b175c004a5b4c4f785e.tar.bz2
Attempt to fix build failure on OS X and Debian alpha; the symptom is
consistent with os.wait() returning immediately because some other subprocess had previously exited; the test suite then immediately tries to lock the mailbox and gets an error saying it's already locked. To fix this, do a waitpid() so the test suite only continues once the intended child process has exited.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_mailbox.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index b00496c..e17de5d 100644
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -740,7 +740,7 @@ class _TestMboxMMDF(TestMailbox):
self._box.lock)
# Wait for child to exit. Locking should now succeed.
- pid, status = os.wait()
+ exited_pid, status = os.waitpid(pid, 0)
self._box.lock()
self._box.unlock()