From: Andrew M. Kuchling <amk@amk.ca>
Date: Mon, 26 Jun 2006 17:00:35 +0000 (+0000)
Subject: Attempt to fix build failure on OS X and Debian alpha; the symptom is
X-Git-Tag: v2.5b2~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15486f78f0ccb04b86905b175c004a5b4c4f785e;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index b00496ca4f70..e17de5dfdd01 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()