traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Followup to issue #11867: Use socketpair(), since FreeBSD < 8 doesn't really 

support multiprocessing.Event.
This commit is contained in:
Charles-François Natali 2011-12-20 11:47:23 +01:00
parent 5879ca1fd9
commit 8366b8417b
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Lib/test/test_mailbox.py
View File

@ -15,10 +15,6 @@ try:
import fcntl
except ImportError:
pass
try:
import multiprocessing
except ImportError:
multiprocessing = None
# Silence Py3k warning
rfc822 = test_support.import_module('rfc822', deprecated=True)
@ -870,12 +866,13 @@ class _TestMboxMMDF(TestMailbox):
self._box = self._factory(self._path)
@unittest.skipUnless(hasattr(os, 'fork'), "Test needs fork().")
@unittest.skipUnless(multiprocessing, "Test needs multiprocessing.")
@unittest.skipUnless(hasattr(socket, 'socketpair'), "Test needs socketpair().")
def test_lock_conflict(self):
# Fork off a child process that will lock the mailbox temporarily,
# unlock it and exit.
ready = multiprocessing.Event()
done = multiprocessing.Event()
c, p = socket.socketpair()
self.addCleanup(c.close)
self.addCleanup(p.close)
pid = os.fork()
if pid == 0:
@ -883,22 +880,22 @@ class _TestMboxMMDF(TestMailbox):
try:
# lock the mailbox, and signal the parent it can proceed
self._box.lock()
ready.set()
c.send(b'c')
# wait until the parent is done, and unlock the mailbox
done.wait(5)
c.recv(1)
self._box.unlock()
finally:
os._exit(0)
# In the parent, wait until the child signals it locked the mailbox.
ready.wait(5)
p.recv(1)
try:
self.assertRaises(mailbox.ExternalClashError,
self._box.lock)
finally:
# Signal the child it can now release the lock and exit.
done.set()
p.send(b'p')
# Wait for child to exit. Locking should now succeed.
exited_pid, status = os.waitpid(pid, 0)