mbox locking: combine locking functions into one and swap lock order

We used to create a dotlock file first and then lock with fcntl; swap that
order, since locking first with fcntl seems to be more common.

This patch also adds general mbox lock/unlock methods, which call the
dotlock and fcntl-lock methods, and moves the retry logic there.

When the dotlock and fcntl methods fail to acquire a lock, they now raise
a custom exception "LockUnavailable", which gets caught in the general
lock() method.  That way, if we succeed to acquire one lock but fail to
acquire the other, we can release our locks at the upper level and retry.

1 files changed, 4 insertions, 4 deletions

diff --git a/test_archivemail.py b/test_archivemail.py
index a2d4767..55c294f 100755
--- a/test_archivemail.py
+++ b/test_archivemail.py
@@ -115,9 +115,9 @@ class TestMboxDotlock(TestCaseInTempdir):
     def testDotlock(self):
         """dotlock_lock/unlock should create/delete a lockfile"""
         lock = self.mbox_name + ".lock"
-        self.mbox.dotlock_lock()
+        self.mbox._dotlock_lock()
         assert(os.path.isfile(lock))
-        self.mbox.dotlock_unlock()
+        self.mbox._dotlock_unlock()
         assert(not os.path.isfile(lock))
 
 class TestMboxPosixLock(TestCaseInTempdir):
@@ -138,9 +138,9 @@ class TestMboxPosixLock(TestCaseInTempdir):
         pid = os.fork()
         if pid == 0:
             # In the child, lock the mailbox.
-            self.mbox.posix_lock()
+            self.mbox._posix_lock()
             time.sleep(2)
-            self.mbox.posix_unlock()
+            self.mbox._posix_unlock()
             os._exit(0)
 
         # In the parent, sleep a bit to give the child time to acquire