[Buildbot-commits] buildbot/buildbot/test test_locks.py,1.4,1.5

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5653/buildbot/test

Modified Files:
	test_locks.py 
Log Message:
[project @ test_locks: make tests compatible with twisted-1.3.0]

Original author: warner at lothar.com
Date: 2006-08-26 19:49:05

Index: test_locks.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_locks.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test_locks.py	24 Aug 2006 10:05:20 -0000	1.4
+++ test_locks.py	26 Aug 2006 19:50:50 -0000	1.5
@@ -47,13 +47,13 @@
         lock = locks.BaseLock("name")
         d = claimHarder(lock, "owner1")
         d.addCallback(lambda lock: lock.release("owner1"))
-        return d
+        return maybeWait(d)
 
     def testCompetition(self):
         lock = locks.BaseLock("name")
         d = claimHarder(lock, "owner1")
         d.addCallback(self._claim1)
-        return d
+        return maybeWait(d)
     def _claim1(self, lock):
         # we should have claimed it by now
         self.failIf(lock.isAvailable())
@@ -85,7 +85,7 @@
             dl.append(d)
         d = defer.DeferredList(dl)
         d.addCallback(self._cleanup, lock)
-        return d
+        return maybeWait(d)
 
 class Multi(unittest.TestCase):
     def testNow(self):
@@ -108,7 +108,7 @@
         d.addCallback(lambda lock: lock.release("owner3"))
         lock.release("owner2")
         lock.release("owner1")
-        return d
+        return maybeWait(d)
 
     def _cleanup(self, res, lock, count):
         dl = []
@@ -140,7 +140,7 @@
             dl.append(d)
         d = defer.DeferredList(dl)
         d.addCallback(self._cleanup, lock, COUNT)
-        return d
+        return maybeWait(d)
 
 class Dummy:
     pass