]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
test_introducer_and_vdrive: remove the assumption that startService returns a Deferred
authorBrian Warner <warner@allmydata.com>
Thu, 24 May 2007 00:37:20 +0000 (17:37 -0700)
committerBrian Warner <warner@allmydata.com>
Thu, 24 May 2007 00:37:20 +0000 (17:37 -0700)
src/allmydata/test/test_introducer_and_vdrive.py

index 31338a794574354fdd154338a83d4119d067d432..c85d20aee4310917d772022b98a0ff3517fd65db 100644 (file)
@@ -1,6 +1,6 @@
 
 from twisted.trial import unittest
-from foolscap.eventual import flushEventualQueue
+from foolscap.eventual import fireEventually, flushEventualQueue
 
 from allmydata import introducer_and_vdrive
 from allmydata.util import testutil
@@ -8,7 +8,8 @@ from allmydata.util import testutil
 class Basic(testutil.SignalMixin, unittest.TestCase):
     def test_loadable(self):
         q = introducer_and_vdrive.IntroducerAndVdrive()
-        d = q.startService()
+        d = fireEventually(None)
+        d.addCallback(lambda res: q.startService())
         d.addCallback(lambda res: q.stopService())
         d.addCallback(flushEventualQueue)
         return d