[minion-cvs] Version of blocking lockfile tesst that should work on ...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv17664/lib/mixminion

Modified Files:
	test.py 
Log Message:
Version of blocking lockfile tesst that should work on bsdish systems.

Index: test.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/test.py,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- test.py	14 Feb 2003 02:00:55 -0000	1.89
+++ test.py	14 Feb 2003 17:51:57 -0000	1.90
@@ -494,22 +494,25 @@
         #         happily on *BSD.  (The issue is that a blocking
         #         flock seems to block _all_ the threads in this
         #         process, not just this one.)
-##         # Now try a blocking lock.
-##         released=[0]
-##         def threadBody(LF2=LF2,released=released):
-##             LF2.acquire("LF2",blocking=1)
-##             if not released[0]:
-##                 released[0] = 'BAD'
-##             else:
-##                 released[0] = 'GOOD'
-        
-##         t = threading.Thread(None, threadBody)
-##         t.start()
-##         time.sleep(.1)
-##         released[0] = 1
-##         LF1.release()
-##         t.join()
-##         self.assertEquals("GOOD", released[0])
+
+        # Now try a blocking lock.  We need to block in another process
+        # because of some platforms' implementations of threading.
+        releasedFile = mix_mktemp()
+        writeFile(releasedFile, "nobody")
+        pid = os.fork()
+        if pid == 0: # child
+            LF2.acquire("LF2", blocking=1)
+            if readFile(releasedFile) == 'parent':
+                writeFile(releasedFile, "GOOD")
+            else:
+                writeFile(releasedFile, "BAD")
+            os._exit(0)
+
+        time.sleep(.1)
+        writeFile(releasedFile, 'parent')
+        LF1.release()
+        os.waitpid(pid, 0)
+        self.assertEquals("GOOD", readFile(releasedFile))
 
     def _intervalEq(self, a, *others):
         eq = self.assertEquals