[Buildbot-commits] buildbot/buildbot/test runutils.py, 1.17, 1.18 test_changes.py, 1.9, 1.10 test_config.py, 1.40, 1.41 test_control.py, 1.13, 1.14 test_dependencies.py, 1.5, 1.6 test_locks.py, 1.7, 1.8 test_p4poller.py, 1.3, 1.4 test_properties.py, 1.5, 1.6 test_run.py, 1.42, 1.43 test_scheduler.py, 1.11, 1.12 test_shell.py, 1.4, 1.5 test_slavecommand.py, 1.23, 1.24 test_slaves.py, 1.5, 1.6 test_status.py, 1.35, 1.36 test_steps.py, 1.34, 1.35 test_transfer.py, 1.4, 1.5 test_vc.py, 1.69, 1.70 test_web.py, 1.37, 1.38
Brian Warner
warner at users.sourceforge.net
Mon Dec 11 08:23:31 UTC 2006
Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2276/buildbot/test
Modified Files:
runutils.py test_changes.py test_config.py test_control.py
test_dependencies.py test_locks.py test_p4poller.py
test_properties.py test_run.py test_scheduler.py test_shell.py
test_slavecommand.py test_slaves.py test_status.py
test_steps.py test_transfer.py test_vc.py test_web.py
Log Message:
[project @ remove all uses of buildbot.twcompat.maybeWait, now that we don't need to maintain Twisted-1.3.0 compatibility]
Original author: warner at lothar.com
Date: 2006-12-11 08:21:51
Index: runutils.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/runutils.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- runutils.py 9 Dec 2006 09:16:36 -0000 1.17
+++ runutils.py 11 Dec 2006 08:23:29 -0000 1.18
@@ -5,7 +5,6 @@
from twisted.python import log, util
from buildbot import master, interfaces
-from buildbot.twcompat import maybeWait
from buildbot.slave import bot
from buildbot.process.builder import Builder
from buildbot.process.base import BuildRequest, Build
@@ -137,7 +136,7 @@
d = self.shutdownAllSlaves()
d.addCallback(self._tearDown_1)
d.addCallback(self._tearDown_2)
- return maybeWait(d)
+ return d
def _tearDown_1(self, res):
if self.master:
return defer.maybeDeferred(self.master.stopService)
Index: test_changes.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_changes.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- test_changes.py 6 Sep 2006 00:41:55 -0000 1.9
+++ test_changes.py 11 Dec 2006 08:23:29 -0000 1.10
@@ -4,7 +4,6 @@
from twisted.internet import defer, reactor
from buildbot import master
-from buildbot.twcompat import maybeWait
from buildbot.changes import pb
from buildbot.scripts import runner
@@ -122,7 +121,7 @@
# This iterate() is a quick hack to deal with the problem. I need to
# investigate more thoroughly and find a better solution.
d.addCallback(self.stall, 0.1)
- return maybeWait(d)
+ return d
def stall(self, res, timeout):
d = defer.Deferred()
@@ -136,7 +135,7 @@
# have to load it twice. Clean this up.
d = self.master.loadConfig(config_sender)
d.addCallback(self._testSender_1)
- return maybeWait(d)
+ return d
def _testSender_1(self, res):
self.cm = cm = self.master.change_svc
Index: test_config.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_config.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- test_config.py 11 Dec 2006 05:09:51 -0000 1.40
+++ test_config.py 11 Dec 2006 08:23:29 -0000 1.41
@@ -14,7 +14,7 @@
except ImportError:
pass
-from buildbot.twcompat import providedBy, maybeWait
+from buildbot.twcompat import providedBy
from buildbot.master import BuildMaster
from buildbot import scheduler
from twisted.application import service, internet
@@ -515,7 +515,7 @@
d = master.loadConfig(self.sourcesCfg)
d.addCallback(self._testSources_1)
- return maybeWait(d)
+ return d
def _testSources_1(self, res):
self.failUnlessEqual(len(list(self.buildmaster.change_svc)), 1)
@@ -629,7 +629,7 @@
d.addCallback(_loadConfig, badcfg)
d.addBoth(_shouldBeFailure, "Schedulers must have unique names")
- return maybeWait(d)
+ return d
def testSchedulers(self):
master = self.buildmaster
@@ -639,7 +639,7 @@
d = self.buildmaster.loadConfig(schedulersCfg)
d.addCallback(self._testSchedulers_1)
- return maybeWait(d)
+ return d
def _testSchedulers_1(self, res):
sch = self.buildmaster.allSchedulers()
@@ -806,7 +806,7 @@
d.addCallback(lambda res: master.loadConfig(ircCfg1))
e5 = {'irc.us.freenode.net': ('buildbot', ['twisted'])}
d.addCallback(lambda res: self.checkIRC(master, e5))
- return maybeWait(d)
+ return d
def testWebPortnum(self):
master = self.buildmaster
@@ -814,7 +814,7 @@
d = master.loadConfig(webCfg1)
d.addCallback(self._testWebPortnum_1)
- return maybeWait(d)
+ return d
def _testWebPortnum_1(self, res):
ports = self.checkPorts(self.buildmaster, [(9999, pb.PBServerFactory),
(9980, Site)])
@@ -857,7 +857,7 @@
d = master.loadConfig(webNameCfg1)
d.addCallback(self._testWebPathname_1)
- return maybeWait(d)
+ return d
def _testWebPathname_1(self, res):
self.checkPorts(self.buildmaster,
[(9999, pb.PBServerFactory),
@@ -1056,7 +1056,7 @@
m.startService()
d = m.loadConfig(startableEmptyCfg % 0)
d.addCallback(self._testStartService_0)
- return maybeWait(d)
+ return d
def _testStartService_0(self, res):
m = self.master
Index: test_control.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_control.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- test_control.py 24 Nov 2006 07:19:55 -0000 1.13
+++ test_control.py 11 Dec 2006 08:23:29 -0000 1.14
@@ -7,7 +7,7 @@
from buildbot import master, interfaces
from buildbot.sourcestamp import SourceStamp
-from buildbot.twcompat import providedBy, maybeWait
+from buildbot.twcompat import providedBy
from buildbot.slave import bot
from buildbot.status.builder import SUCCESS
from buildbot.process import base
@@ -70,7 +70,7 @@
dl.append(defer.maybeDeferred(self.slave.stopService))
if self.master:
dl.append(defer.maybeDeferred(self.master.stopService))
- return maybeWait(defer.DeferredList(dl))
+ return defer.DeferredList(dl)
def testRequest(self):
m = self.master
@@ -78,7 +78,7 @@
m.startService()
d = self.connectSlave()
d.addCallback(self._testRequest_1)
- return maybeWait(d)
+ return d
def _testRequest_1(self, res):
c = interfaces.IControl(self.master)
req = base.BuildRequest("I was bored", SourceStamp())
Index: test_dependencies.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_dependencies.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test_dependencies.py 15 Sep 2006 14:47:41 -0000 1.5
+++ test_dependencies.py 11 Dec 2006 08:23:29 -0000 1.6
@@ -5,7 +5,6 @@
from twisted.internet import reactor, defer
from buildbot.test.runutils import RunMixin
-from buildbot.twcompat import maybeWait
from buildbot.status import base
config_1 = """
@@ -68,7 +67,7 @@
self.master.startService()
d = self.connectSlave(["slowpass", "fastfail", "fastpass",
"b3", "b4", "b5"])
- return maybeWait(d)
+ return d
def findScheduler(self, name):
for s in self.master.allSchedulers():
@@ -96,7 +95,7 @@
d = defer.Deferred()
d.addCallback(self._testRun_Fail_1)
reactor.callLater(5, d.callback, None)
- return maybeWait(d)
+ return d
def _testRun_Fail_1(self, res):
# 'slowpass' and 'fastfail' should have run one build each
@@ -138,7 +137,7 @@
d = defer.Deferred()
d.addCallback(self._testRun_Pass_1)
reactor.callLater(5, d.callback, None)
- return maybeWait(d)
+ return d
def _testRun_Pass_1(self, res):
# 'fastpass' and 'slowpass' should have run one build each
Index: test_locks.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_locks.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- test_locks.py 15 Sep 2006 14:47:41 -0000 1.7
+++ test_locks.py 11 Dec 2006 08:23:29 -0000 1.8
@@ -10,7 +10,6 @@
from buildbot.sourcestamp import SourceStamp
from buildbot.process.base import BuildRequest
from buildbot.test.runutils import RunMixin
-from buildbot.twcompat import maybeWait
from buildbot import locks
def claimHarder(lock, owner):
@@ -47,13 +46,13 @@
lock = locks.BaseLock("name")
d = claimHarder(lock, "owner1")
d.addCallback(lambda lock: lock.release("owner1"))
- return maybeWait(d)
+ return d
def testCompetition(self):
lock = locks.BaseLock("name")
d = claimHarder(lock, "owner1")
d.addCallback(self._claim1)
- return maybeWait(d)
+ return d
def _claim1(self, lock):
# we should have claimed it by now
self.failIf(lock.isAvailable())
@@ -85,7 +84,7 @@
dl.append(d)
d = defer.DeferredList(dl)
d.addCallback(self._cleanup, lock)
- return maybeWait(d)
+ return d
class Multi(unittest.TestCase):
def testNow(self):
@@ -108,7 +107,7 @@
d.addCallback(lambda lock: lock.release("owner3"))
lock.release("owner2")
lock.release("owner1")
- return maybeWait(d)
+ return d
def _cleanup(self, res, lock, count):
dl = []
@@ -140,7 +139,7 @@
dl.append(d)
d = defer.DeferredList(dl)
d.addCallback(self._cleanup, lock, COUNT)
- return maybeWait(d)
+ return d
class Dummy:
pass
@@ -333,7 +332,7 @@
["full1a", "full1b",
"full1c", "full1d",
"full2a", "full2b"]))
- return maybeWait(d)
+ return d
def testLock1(self):
self.control.getBuilder("full1a").requestBuild(self.req1)
@@ -341,7 +340,7 @@
d = defer.DeferredList([self.req1.waitUntilFinished(),
self.req2.waitUntilFinished()])
d.addCallback(self._testLock1_1)
- return maybeWait(d)
+ return d
def _testLock1_1(self, res):
# full1a should complete its step before full1b starts it
@@ -355,7 +354,7 @@
# in which full1a and full1b wind up with distinct Lock instances.
d = self.master.loadConfig(config_1a)
d.addCallback(self._testLock1a_1)
- return maybeWait(d)
+ return d
def _testLock1a_1(self, res):
self.control.getBuilder("full1a").requestBuild(self.req1)
self.control.getBuilder("full1b").requestBuild(self.req2)
@@ -378,7 +377,7 @@
d = defer.DeferredList([self.req1.waitUntilFinished(),
self.req2.waitUntilFinished()])
d.addCallback(self._testLock2_1)
- return maybeWait(d)
+ return d
def _testLock2_1(self, res):
# full2a should start its step before full1a finishes it. They run on
@@ -394,7 +393,7 @@
d = defer.DeferredList([self.req1.waitUntilFinished(),
self.req2.waitUntilFinished()])
d.addCallback(self._testLock3_1)
- return maybeWait(d)
+ return d
def _testLock3_1(self, res):
# full2b should not start until after full1c finishes. The builds run
@@ -414,7 +413,7 @@
self.req2.waitUntilFinished(),
self.req3.waitUntilFinished()])
d.addCallback(self._testLock4_1)
- return maybeWait(d)
+ return d
def _testLock4_1(self, res):
# full1a starts, then full1d starts (because they do not interfere).
Index: test_p4poller.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_p4poller.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- test_p4poller.py 6 Sep 2006 00:41:55 -0000 1.3
+++ test_p4poller.py 11 Dec 2006 08:23:29 -0000 1.4
@@ -4,7 +4,6 @@
from twisted.internet import defer
from twisted.trial import unittest
-from buildbot.twcompat import maybeWait
from buildbot.changes.changes import Change
from buildbot.changes.p4poller import P4Source, get_simple_split
@@ -105,7 +104,7 @@
# The first time, it just learns the change to start at.
self.assert_(self.t.last_change is None)
self.assert_(not self.t.working)
- return maybeWait(self.t.checkp4().addCallback(self._testCheck2))
+ return self.t.checkp4().addCallback(self._testCheck2)
def _testCheck2(self, res):
self.assertEquals(self.changes, [])
@@ -161,7 +160,7 @@
self.t.parent = self
d = self.t.checkp4()
d.addBoth(self._testFailedChanges2)
- return maybeWait(d)
+ return d
def _testFailedChanges2(self, f):
self.assert_(isinstance(f, failure.Failure))
@@ -177,7 +176,7 @@
self.t.parent = self
d = self.t.checkp4()
d.addCallback(self._testFailedDescribe2)
- return maybeWait(d)
+ return d
def _testFailedDescribe2(self, res):
# first time finds nothing; check again.
Index: test_properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_properties.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test_properties.py 15 Sep 2006 14:47:41 -0000 1.5
+++ test_properties.py 11 Dec 2006 08:23:29 -0000 1.6
@@ -4,7 +4,6 @@
from twisted.trial import unittest
-from buildbot.twcompat import maybeWait
from buildbot.sourcestamp import SourceStamp
from buildbot.process import base
from buildbot.steps.shell import ShellCommand, WithProperties
@@ -161,7 +160,7 @@
self.failUnless(os.path.exists(f))
return res
d.addCallback(_check_touch)
- return maybeWait(d)
+ return d
# we test got_revision in test_vc
Index: test_run.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_run.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- test_run.py 24 Nov 2006 07:19:55 -0000 1.42
+++ test_run.py 11 Dec 2006 08:23:29 -0000 1.43
@@ -9,7 +9,6 @@
from buildbot.changes import changes
from buildbot.status import builder
from buildbot.process.base import BuildRequest
-from buildbot.twcompat import maybeWait
from buildbot.test.runutils import RunMixin, rmtree
@@ -89,7 +88,7 @@
self.failUnless(s.timer)
# halting the service will also stop the timer
d = defer.maybeDeferred(m.stopService)
- return maybeWait(d)
+ return d
class Ping(RunMixin, unittest.TestCase):
def testPing(self):
@@ -99,7 +98,7 @@
d = self.connectSlave()
d.addCallback(self._testPing_1)
- return maybeWait(d)
+ return d
def _testPing_1(self, res):
d = interfaces.IControl(self.master).getBuilder("dummy").ping(1)
@@ -149,7 +148,7 @@
d = self.connectSlave()
d.addCallback(self._disconnectSetup_1)
- return maybeWait(d)
+ return d
def _disconnectSetup_1(self, res):
self.failUnlessEqual(self.s1.getState(), ("idle", []))
@@ -203,7 +202,7 @@
d = defer.Deferred()
d.addCallback(self._testIdle2_1, req)
reactor.callLater(3, d.callback, None)
- return maybeWait(d, 5)
+ return d
testIdle2.timeout = 5
def _testIdle2_1(self, res, req):
@@ -219,7 +218,7 @@
#
d = self.submitBuild()
d.addCallback(self._testBuild1_1)
- return maybeWait(d)
+ return d
def _testBuild1_1(self, bc):
bs = bc.getStatus()
@@ -248,7 +247,7 @@
# this next sequence is timing-dependent
d = self.submitBuild()
d.addCallback(self._testBuild1_1)
- return maybeWait(d, 30)
+ return d
testBuild2.timeout = 30
def _testBuild1_1(self, bc):
@@ -278,7 +277,7 @@
# this next sequence is timing-dependent
d = self.submitBuild()
d.addCallback(self._testBuild3_1)
- return maybeWait(d, 30)
+ return d
testBuild3.timeout = 30
def _testBuild3_1(self, bc):
@@ -305,7 +304,7 @@
# this next sequence is timing-dependent
d = self.submitBuild()
d.addCallback(self._testBuild4_1)
- return maybeWait(d, 30)
+ return d
testBuild4.timeout = 30
def _testBuild4_1(self, bc):
@@ -330,7 +329,7 @@
# this next sequence is timing-dependent
d = self.submitBuild()
d.addCallback(self._testInterrupt_1)
- return maybeWait(d, 30)
+ return d
testInterrupt.timeout = 30
def _testInterrupt_1(self, bc):
@@ -351,7 +350,7 @@
# ping should succeed
d = bc.ping(1)
d.addCallback(self._testDisappear_1, bc)
- return maybeWait(d)
+ return d
def _testDisappear_1(self, res, bc):
self.failUnlessEqual(res, True)
@@ -383,7 +382,7 @@
# now let the new slave take over
self.connectSlave2()
d.addCallback(self._testDuplicate_1, ss)
- return maybeWait(d, 2)
+ return d
testDuplicate.timeout = 5
def _testDuplicate_1(self, res, ss):
@@ -420,7 +419,7 @@
d = self.connectSlaveFastTimeout()
d.addCallback(self._setup_disconnect2_1)
- return maybeWait(d)
+ return d
def _setup_disconnect2_1(self, res):
self.failUnlessEqual(self.s1.getState(), ("idle", []))
@@ -438,7 +437,7 @@
d = defer.Deferred()
reactor.callLater(5, d.callback, None)
d.addCallback(self._testSlaveTimeout_1)
- return maybeWait(d, 20)
+ return d
testSlaveTimeout.timeout = 20
def _testSlaveTimeout_1(self, res):
@@ -478,7 +477,7 @@
d = self.connectSlave()
d.addCallback(self._testChangeBuilddir_1)
- return maybeWait(d)
+ return d
def _testChangeBuilddir_1(self, res):
self.bot = bot = self.slaves['bot1'].bot
Index: test_scheduler.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_scheduler.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- test_scheduler.py 30 Sep 2006 22:36:22 -0000 1.11
+++ test_scheduler.py 11 Dec 2006 08:23:29 -0000 1.12
@@ -8,7 +8,6 @@
from twisted.spread import pb
from buildbot import scheduler, sourcestamp, buildset, status
-from buildbot.twcompat import maybeWait
from buildbot.changes.changes import Change
from buildbot.scripts import tryclient
@@ -30,7 +29,7 @@
def tearDown(self):
d = self.master.stopService()
- return maybeWait(d)
+ return d
def addScheduler(self, s):
s.setServiceParent(self.master)
@@ -40,7 +39,7 @@
d = defer.Deferred()
reactor.callLater(5, d.callback, None)
d.addCallback(self._testPeriodic1_1)
- return maybeWait(d)
+ return d
def _testPeriodic1_1(self, res):
self.failUnless(len(self.master.sets) > 1)
s1 = self.master.sets[0]
@@ -115,7 +114,7 @@
d = defer.Deferred()
reactor.callLater(4, d.callback, None)
d.addCallback(self._testBranch_1)
- return maybeWait(d)
+ return d
def _testBranch_1(self, res):
self.failUnlessEqual(len(self.master.sets), 1)
s = self.master.sets[0].source
@@ -149,7 +148,7 @@
d = defer.Deferred()
reactor.callLater(2, d.callback, None)
d.addCallback(self._testAnyBranch_1)
- return maybeWait(d)
+ return d
def _testAnyBranch_1(self, res):
self.failUnlessEqual(len(self.master.sets), 3)
self.master.sets.sort(lambda a,b: cmp(a.source.branch,
@@ -193,7 +192,7 @@
d = defer.Deferred()
reactor.callLater(2, d.callback, None)
d.addCallback(self._testAnyBranch2_1)
- return maybeWait(d)
+ return d
def _testAnyBranch2_1(self, res):
self.failUnlessEqual(len(self.master.sets), 2)
self.master.sets.sort(lambda a,b: cmp(a.source.branch,
@@ -253,7 +252,7 @@
# N.B.: if we don't have DNotify, we poll every 10 seconds, so don't
# set a .timeout here shorter than that. TODO: make it possible to
# set the polling interval, so we can make it shorter.
- return maybeWait(d, 5)
+ return d
def _testTryJobdir_1(self, bs):
self.failUnlessEqual(bs.builderNames, ["a", "b"])
@@ -279,7 +278,7 @@
d2 = self.master.d = defer.Deferred()
d = t.deliverJob()
d.addCallback(self._testTryUserpass_1, t, d2)
- return maybeWait(d, 5)
+ return d
testTryUserpass.timeout = 5
def _testTryUserpass_1(self, res, t, d2):
# at this point, the Try object should have a RemoteReference to the
Index: test_shell.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_shell.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test_shell.py 6 Sep 2006 00:41:55 -0000 1.4
+++ test_shell.py 11 Dec 2006 08:23:29 -0000 1.5
@@ -7,7 +7,6 @@
from twisted.internet import reactor, defer
from twisted.python import util
from buildbot.slave.commands import SlaveShellCommand
-from buildbot.twcompat import maybeWait
from buildbot.test.runutils import SlaveCommandTestBase
class SlaveSide(SlaveCommandTestBase, unittest.TestCase):
@@ -24,7 +23,7 @@
self.failUnlessEqual(logs['stdout'], "this is stdout\n")
self.failUnlessEqual(logs['stderr'], "this is stderr\n")
d.addCallback(_check)
- return maybeWait(d)
+ return d
# TODO: move test_slavecommand.Shell and .ShellPTY over here
@@ -106,7 +105,7 @@
self._generateText("log3"))
d.addCallback(_check)
d.addBoth(self._maybePrintError)
- return maybeWait(d)
+ return d
def _check_and_wait(self, res=None):
self._check_timeout -= 1
Index: test_slavecommand.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_slavecommand.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- test_slavecommand.py 6 Sep 2006 00:41:55 -0000 1.23
+++ test_slavecommand.py 11 Dec 2006 08:23:29 -0000 1.24
@@ -3,7 +3,6 @@
from twisted.trial import unittest
from twisted.internet import reactor, interfaces
from twisted.python import runtime, failure, util
-from buildbot.twcompat import maybeWait
import os, sys
@@ -88,7 +87,7 @@
def _check_targetfile(res):
self.failUnless(os.path.exists(targetfile))
d.addCallback(_check_targetfile)
- return maybeWait(d)
+ return d
def _checkPass(self, res, expected, rc):
self.checkOutput(expected)
@@ -102,7 +101,7 @@
expected = [('stdout', "this is stdout\n"),
('stderr', "this is stderr\n")]
d.addCallback(self._checkPass, expected, 0)
- return maybeWait(d)
+ return d
def testShellRC(self):
cmd = [sys.executable, self.emitcmd, "1"]
@@ -112,7 +111,7 @@
expected = [('stdout', "this is stdout\n"),
('stderr', "this is stderr\n")]
d.addCallback(self._checkPass, expected, 1)
- return maybeWait(d)
+ return d
def testShellEnv(self):
cmd = "%s %s 0" % (sys.executable, self.emitcmd)
@@ -125,7 +124,7 @@
('stdout', "EMIT_TEST: envtest\n"),
]
d.addCallback(self._checkPass, expected, 0)
- return maybeWait(d)
+ return d
def testShellSubdir(self):
targetfile = os.path.join(self.basedir, "subdir", "log1.out")
@@ -141,7 +140,7 @@
def _check_targetfile(res):
self.failUnless(os.path.exists(targetfile))
d.addCallback(_check_targetfile)
- return maybeWait(d)
+ return d
def testShellMissingCommand(self):
args = {'command': "/bin/EndWorldHungerAndMakePigsFly",
@@ -151,7 +150,7 @@
c = SlaveShellCommand(self.builder, None, args)
d = c.start()
d.addCallback(self._testShellMissingCommand_1)
- return maybeWait(d)
+ return d
def _testShellMissingCommand_1(self, res):
self.failIfEqual(self.getrc(), 0)
# we used to check the error message to make sure it said something
@@ -165,7 +164,7 @@
c = SlaveShellCommand(self.builder, None, args)
d = c.start()
d.addCallback(self._testTimeout_1)
- return maybeWait(d)
+ return d
def _testTimeout_1(self, res):
self.failIfEqual(self.getrc(), 0)
got = self.getfile('header')
@@ -186,7 +185,7 @@
d = c.start()
reactor.callLater(1, c.interrupt)
d.addCallback(self._testInterrupt1_1)
- return maybeWait(d)
+ return d
def _testInterrupt1_1(self, res):
self.failIfEqual(self.getrc(), 0)
got = self.getfile('header')
@@ -216,7 +215,7 @@
c.command.KILL = None
reactor.callLater(1, c.interrupt)
d.addBoth(self._testInterrupt2_1)
- return maybeWait(d)
+ return d
def _testInterrupt2_1(self, res):
# the slave should raise a TimeoutError exception. In a normal build
# process (i.e. one that uses step.RemoteShellCommand), this
Index: test_slaves.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_slaves.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test_slaves.py 24 Nov 2006 07:16:35 -0000 1.5
+++ test_slaves.py 11 Dec 2006 08:23:29 -0000 1.6
@@ -1,7 +1,6 @@
# -*- test-case-name: buildbot.test.test_slaves -*-
from twisted.trial import unittest
-from buildbot.twcompat import maybeWait
from twisted.internet import defer, reactor
from twisted.python import log
@@ -49,7 +48,7 @@
self.master.startService()
d = self.connectSlave(["b1"])
d.addCallback(lambda res: self.connectSlave(["b1"], "bot2"))
- return maybeWait(d)
+ return d
def doBuild(self, buildername):
br = BuildRequest("forced", SourceStamp())
@@ -72,7 +71,7 @@
d = self.doBuild("b1")
d.addCallback(self._testSequence_1)
- return maybeWait(d)
+ return d
def _testSequence_1(self, res):
self.failUnlessEqual(res.getResults(), SUCCESS)
self.failUnlessEqual(res.getSlavename(), "bot1")
@@ -89,7 +88,7 @@
d1 = self.doBuild("b1")
d2 = self.doBuild("b1")
d1.addCallback(self._testSimultaneous_1, d2)
- return maybeWait(d1)
+ return d1
def _testSimultaneous_1(self, res, d2):
self.failUnlessEqual(res.getResults(), SUCCESS)
self.failUnlessEqual(res.getSlavename(), "bot1")
@@ -104,7 +103,7 @@
# slave instead
d = self.shutdownSlave("bot1", "b1")
d.addCallback(self._testFallback1_1)
- return maybeWait(d)
+ return d
def _testFallback1_1(self, res):
attached_slaves = [c for c in self.master.botmaster.slaves.values()
if c.slave]
@@ -129,7 +128,7 @@
self.disappearSlave("bot1", "b1")
d = self.doBuild("b1")
d.addCallback(self._testFallback2_1)
- return maybeWait(d)
+ return d
def _testFallback2_1(self, res):
self.failUnlessEqual(res.getResults(), SUCCESS)
self.failUnlessEqual(res.getSlavename(), "bot2")
@@ -159,7 +158,7 @@
d2 = defer.Deferred()
d2.addCallback(self._testDontClaimPingingSlave_1, d1, s1, timers)
reactor.callLater(1, d2.callback, None)
- return maybeWait(d2)
+ return d2
def _testDontClaimPingingSlave_1(self, res, d1, s1, timers):
# now the first build is running (waiting on the ping), so start the
# second build. This should claim the second slave, not the first,
@@ -224,7 +223,7 @@
self.master.loadConfig(config_3)
self.master.startService()
d = self.connectSlave(["b1"])
- return maybeWait(d)
+ return d
def _one_started(self):
log.msg("testReconfig._one_started")
@@ -413,7 +412,7 @@
# build has already started.
d = self.connectSlave(["b1"], opts={"failPingOnce": True})
d.addCallback(self._testFirstComeFirstServed_1, d1, d2)
- return maybeWait(d)
+ return d
def _testFirstComeFirstServed_1(self, res, d1, d2):
# the master has send the slaveping. When this is received, it will
# fail, causing the master to hang up on the slave. When it
Index: test_status.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_status.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- test_status.py 15 Sep 2006 14:48:53 -0000 1.35
+++ test_status.py 11 Dec 2006 08:23:29 -0000 1.36
@@ -8,7 +8,7 @@
from buildbot import interfaces
from buildbot.sourcestamp import SourceStamp
from buildbot.process.base import BuildRequest
-from buildbot.twcompat import implements, providedBy, maybeWait
+from buildbot.twcompat import implements, providedBy
from buildbot.status import builder, base
mail = None
@@ -360,7 +360,7 @@
# otherwise a malicious SMTP server could make us consume lots of
# memory.
d.addCallback(self.stall, 0.1)
- return maybeWait(d)
+ return d
if not mail:
Mail.skip = "the Twisted Mail package is not installed"
@@ -629,7 +629,8 @@
s = MyLogConsumer()
d = l1.subscribeConsumer(s)
d.addCallback(self._testConsumer_1, s)
- return maybeWait(d, 5)
+ return d
+ testConsumer.timeout = 5
def _testConsumer_1(self, res, s):
self.failIf(s.chunks)
self.failUnless(s.finished)
@@ -721,7 +722,7 @@
# NetstringReceiver.dataReceived where it does
# self.transport.loseConnection() because of the NetstringParseError,
# however self.transport is None
- return maybeWait(d, 5)
+ return d
testLargeSummary.timeout = 5
config_base = """
@@ -859,7 +860,7 @@
d = self.connectSlave(builders=["dummy", "testdummy"])
d.addCallback(self._testSlave_1, t1)
- return maybeWait(d)
+ return d
def _testSlave_1(self, res, t1):
self.failUnlessEqual(len(t1.events), 2)
Index: test_steps.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_steps.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- test_steps.py 24 Nov 2006 07:19:40 -0000 1.34
+++ test_steps.py 11 Dec 2006 08:23:29 -0000 1.35
@@ -26,7 +26,6 @@
from buildbot.status.builder import SUCCESS, FAILURE
from buildbot.test.runutils import RunMixin, rmtree
from buildbot.test.runutils import makeBuildStep, StepTester
-from buildbot.twcompat import maybeWait
from buildbot.slave import commands, registry
@@ -307,7 +306,7 @@
self.master.loadConfig(version_config)
self.master.startService()
d = self.connectSlave(["quick"])
- return maybeWait(d)
+ return d
def doBuild(self, buildername):
br = base.BuildRequest("forced", SourceStamp())
@@ -338,7 +337,7 @@
def testCompare(self):
self.master._checker = self.checkCompare
d = self.doBuild("quick")
- return maybeWait(d)
+ return d
class ReorgCompatibility(unittest.TestCase):
@@ -398,7 +397,7 @@
self.failUnless(sb.flag)
self.failUnlessEqual(sb.flag_args, {"arg1": "value"})
d.addCallback(_checkSimple)
- return maybeWait(d)
+ return d
class Python(StepTester, unittest.TestCase):
def testPyFlakes1(self):
Index: test_transfer.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_transfer.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test_transfer.py 9 Dec 2006 09:16:36 -0000 1.4
+++ test_transfer.py 11 Dec 2006 08:23:29 -0000 1.5
@@ -3,7 +3,6 @@
import os
from stat import ST_MODE
from twisted.trial import unittest
-from buildbot.twcompat import maybeWait
from buildbot.steps.transfer import FileUpload, FileDownload
from buildbot.test.runutils import StepTester
from buildbot.status.builder import SUCCESS, FAILURE
@@ -56,7 +55,7 @@
masterdest_contents = open(masterdest, "r").read()
self.failUnlessEqual(masterdest_contents, contents)
d.addCallback(_checkUpload)
- return maybeWait(d)
+ return d
def testMaxsize(self):
self.slavebase = "Upload.testMaxsize.slave"
@@ -92,7 +91,7 @@
self.failUnlessEqual(len(masterdest_contents), 12345)
self.failUnlessEqual(masterdest_contents, contents[:12345])
d.addCallback(_checkUpload)
- return maybeWait(d)
+ return d
def testMode(self):
self.slavebase = "Upload.testMode.slave"
@@ -132,7 +131,7 @@
"target mode was %o, we wanted %o" %
(dest_mode, 0755))
d.addCallback(_checkUpload)
- return maybeWait(d)
+ return d
def testMissingFile(self):
self.slavebase = "Upload.testMissingFile.slave"
@@ -153,7 +152,7 @@
self.failUnless(logtext.startswith("Cannot open file"))
self.failUnless(logtext.endswith("for upload"))
d.addCallback(_checkUpload)
- return maybeWait(d)
+ return d
@@ -192,7 +191,7 @@
slavedest_contents = open(slavedest, "r").read()
self.failUnlessEqual(slavedest_contents, contents)
d.addCallback(_checkDownload)
- return maybeWait(d)
+ return d
def testMaxsize(self):
self.slavebase = "Download.testMaxsize.slave"
@@ -225,7 +224,7 @@
self.failUnlessEqual(len(slavedest_contents), 12345)
self.failUnlessEqual(slavedest_contents, contents[:12345])
d.addCallback(_checkDownload)
- return maybeWait(d)
+ return d
def testMode(self):
self.slavebase = "Download.testMode.slave"
@@ -261,7 +260,7 @@
"target mode was %o, we wanted %o" %
(dest_mode, 0755))
d.addCallback(_checkDownload)
- return maybeWait(d)
+ return d
def testMissingFile(self):
self.slavebase = "Download.testMissingFile.slave"
@@ -288,7 +287,7 @@
self.failUnless(logtext.endswith(" not available at master"))
d.addCallbacks(_checkDownload)
- return maybeWait(d)
+ return d
# TODO:
Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- test_vc.py 18 Sep 2006 02:14:45 -0000 1.69
+++ test_vc.py 11 Dec 2006 08:23:29 -0000 1.70
@@ -22,7 +22,7 @@
from buildbot.steps import source
from buildbot.changes import changes
from buildbot.sourcestamp import SourceStamp
-from buildbot.twcompat import maybeWait, which
+from buildbot.twcompat import which
from buildbot.scripts import tryclient
from buildbot.test.runutils import SignalMixin
@@ -423,7 +423,7 @@
def setUp(self):
d = VCS.skipIfNotCapable(self.vc_name)
d.addCallback(self._setUp1)
- return maybeWait(d)
+ return d
def _setUp1(self, res):
self.helper = VCS.getHelper(self.vc_name)
@@ -1073,7 +1073,7 @@
http._logDateTimeStop() # shut down the internal timer. DUMB!
d.addCallback(lambda res: stopHTTPTimer())
d.addCallback(lambda res: self.tearDown2())
- return maybeWait(d)
+ return d
def tearDown2(self):
pass
@@ -1209,19 +1209,19 @@
def testCheckout(self):
d = self.do_vctest()
- return maybeWait(d)
+ return d
def testPatch(self):
d = self.do_patch()
- return maybeWait(d)
+ return d
def testCheckoutBranch(self):
d = self.do_branch()
- return maybeWait(d)
+ return d
def testTry(self):
d = self.do_getpatch(doBranch=False)
- return maybeWait(d)
+ return d
VCS.registerVC(CVS.vc_name, CVSHelper())
@@ -1352,21 +1352,21 @@
# baseURL/defaultBranch style in testPatch and testCheckoutBranch.
self.helper.vcargs = { 'svnurl': self.helper.svnurl_trunk }
d = self.do_vctest()
- return maybeWait(d)
+ return d
def testPatch(self):
self.helper.vcargs = { 'baseURL': self.helper.svnurl + "/",
'defaultBranch': "sample/trunk",
}
d = self.do_patch()
- return maybeWait(d)
+ return d
def testCheckoutBranch(self):
self.helper.vcargs = { 'baseURL': self.helper.svnurl + "/",
'defaultBranch': "sample/trunk",
}
d = self.do_branch()
- return maybeWait(d)
+ return d
def testTry(self):
# extract the base revision and patch from a modified tree, use it to
@@ -1375,7 +1375,7 @@
'defaultBranch': "sample/trunk",
}
d = self.do_getpatch()
- return maybeWait(d)
+ return d
VCS.registerVC(SVN.vc_name, SVNHelper())
@@ -1516,7 +1516,7 @@
def tearDownClass(self):
if self.helper:
- return maybeWait(self.helper.shutdown_p4d())
+ return self.helper.shutdown_p4d()
def testCheckout(self):
self.helper.vcargs = { 'p4port': self.helper.p4port,
@@ -1525,21 +1525,21 @@
d = self.do_vctest(testRetry=False)
# TODO: like arch and darcs, sync does nothing when server is not
# changed.
- return maybeWait(d)
+ return d
def testCheckoutBranch(self):
self.helper.vcargs = { 'p4port': self.helper.p4port,
'p4base': '//depot/',
'defaultBranch': 'trunk' }
d = self.do_branch()
- return maybeWait(d)
+ return d
def testPatch(self):
self.helper.vcargs = { 'p4port': self.helper.p4port,
'p4base': '//depot/',
'defaultBranch': 'trunk' }
d = self.do_patch()
- return maybeWait(d)
+ return d
VCS.registerVC(P4.vc_name, P4Helper())
@@ -1650,32 +1650,32 @@
# TODO: testRetry has the same problem with Darcs as it does for
# Arch
- return maybeWait(d)
+ return d
def testPatch(self):
self.helper.vcargs = { 'baseURL': self.helper.darcs_base + "/",
'defaultBranch': "trunk" }
d = self.do_patch()
- return maybeWait(d)
+ return d
def testCheckoutBranch(self):
self.helper.vcargs = { 'baseURL': self.helper.darcs_base + "/",
'defaultBranch': "trunk" }
d = self.do_branch()
- return maybeWait(d)
+ return d
def testCheckoutHTTP(self):
self.serveHTTP()
repourl = "http://localhost:%d/Darcs-Repository/trunk" % self.httpPort
self.helper.vcargs = { 'repourl': repourl }
d = self.do_vctest(testRetry=False)
- return maybeWait(d)
+ return d
def testTry(self):
self.helper.vcargs = { 'baseURL': self.helper.darcs_base + "/",
'defaultBranch': "trunk" }
d = self.do_getpatch()
- return maybeWait(d)
+ return d
VCS.registerVC(Darcs.vc_name, DarcsHelper())
@@ -1944,7 +1944,7 @@
# some better test logic, probably involving a copy of the
# repository that has a few changes checked in.
- return maybeWait(d)
+ return d
def testCheckoutHTTP(self):
self.serveHTTP()
@@ -1952,25 +1952,25 @@
self.helper.vcargs = { 'url': url,
'version': "testvc--mainline--1" }
d = self.do_vctest(testRetry=False)
- return maybeWait(d)
+ return d
def testPatch(self):
self.helper.vcargs = {'url': self.helper.archrep,
'version': self.helper.defaultbranch }
d = self.do_patch()
- return maybeWait(d)
+ return d
def testCheckoutBranch(self):
self.helper.vcargs = {'url': self.helper.archrep,
'version': self.helper.defaultbranch }
d = self.do_branch()
- return maybeWait(d)
+ return d
def testTry(self):
self.helper.vcargs = {'url': self.helper.archrep,
'version': self.helper.defaultbranch }
d = self.do_getpatch()
- return maybeWait(d)
+ return d
VCS.registerVC(Arch.vc_name, TlaHelper())
@@ -2017,7 +2017,7 @@
# some better test logic, probably involving a copy of the
# repository that has a few changes checked in.
- return maybeWait(d)
+ return d
def testCheckoutHTTP(self):
self.serveHTTP()
@@ -2027,7 +2027,7 @@
'version': self.helper.defaultbranch,
}
d = self.do_vctest(testRetry=False)
- return maybeWait(d)
+ return d
def testPatch(self):
self.helper.vcargs = {'url': self.helper.archrep,
@@ -2036,7 +2036,7 @@
'version': self.helper.defaultbranch,
}
d = self.do_patch()
- return maybeWait(d)
+ return d
def testCheckoutBranch(self):
self.helper.vcargs = {'url': self.helper.archrep,
@@ -2045,7 +2045,7 @@
'version': self.helper.defaultbranch,
}
d = self.do_branch()
- return maybeWait(d)
+ return d
def testTry(self):
self.helper.vcargs = {'url': self.helper.archrep,
@@ -2054,7 +2054,7 @@
'version': self.helper.defaultbranch,
}
d = self.do_getpatch()
- return maybeWait(d)
+ return d
def fixRepository(self):
self.fixtimer = None
@@ -2088,7 +2088,7 @@
}
d = self.do_vctest_once(True)
d.addCallback(self._testRetry_1)
- return maybeWait(d)
+ return d
def _testRetry_1(self, bs):
# make sure there was mention of the retry attempt in the logs
l = bs.getLogs()[0]
@@ -2117,7 +2117,7 @@
}
d = self.do_vctest_once(False)
d.addCallback(self._testRetryFails_1)
- return maybeWait(d)
+ return d
def _testRetryFails_1(self, bs):
self.failUnlessEqual(bs.getResults(), FAILURE)
@@ -2246,26 +2246,26 @@
# TODO: testRetry has the same problem with Mercurial as it does for
# Arch
- return maybeWait(d)
+ return d
def testPatch(self):
self.helper.vcargs = { 'baseURL': self.helper.hg_base + "/",
'defaultBranch': "trunk" }
d = self.do_patch()
- return maybeWait(d)
+ return d
def testCheckoutBranch(self):
self.helper.vcargs = { 'baseURL': self.helper.hg_base + "/",
'defaultBranch': "trunk" }
d = self.do_branch()
- return maybeWait(d)
+ return d
def testCheckoutHTTP(self):
self.serveHTTP()
repourl = "http://localhost:%d/Mercurial-Repository/trunk/.hg" % self.httpPort
self.helper.vcargs = { 'repourl': repourl }
d = self.do_vctest(testRetry=False)
- return maybeWait(d)
+ return d
# TODO: The easiest way to publish hg over HTTP is by running 'hg serve'
# as a child process while the test is running. (you can also use a CGI
# script, which sounds difficult, or you can publish the files directly,
@@ -2276,7 +2276,7 @@
self.helper.vcargs = { 'baseURL': self.helper.hg_base + "/",
'defaultBranch': "trunk" }
d = self.do_getpatch()
- return maybeWait(d)
+ return d
VCS.registerVC(Mercurial.vc_name, MercurialHelper())
@@ -2382,7 +2382,7 @@
sendRC=False, initialStdin=p0_diff)
d = c.start()
d.addCallback(self._testPatch_1)
- return maybeWait(d)
+ return d
def _testPatch_1(self, res):
# make sure the file actually got patched
Index: test_web.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_web.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- test_web.py 17 Sep 2006 20:35:49 -0000 1.37
+++ test_web.py 11 Dec 2006 08:23:29 -0000 1.38
@@ -11,7 +11,7 @@
from twisted.web import client
from buildbot import master, interfaces, sourcestamp
-from buildbot.twcompat import providedBy, maybeWait
+from buildbot.twcompat import providedBy
from buildbot.status import html, builder
from buildbot.changes.changes import Change
from buildbot.process import base
@@ -119,7 +119,7 @@
stopHTTPLog()
if self.master:
d = self.master.stopService()
- return maybeWait(d)
+ return d
def find_waterfall(self, master):
return filter(lambda child: isinstance(child, html.Waterfall),
@@ -138,7 +138,7 @@
d = client.getPage("http://localhost:%d/" % port)
d.addCallback(self._test_webPortnum_1)
- return maybeWait(d)
+ return d
test_webPortnum.timeout = 10
def _test_webPortnum_1(self, page):
#print page
@@ -158,7 +158,7 @@
d = client.getPage("http://localhost:%d/remote/" % p.portnum)
d.addCallback(self._test_webPathname_1, p)
- return maybeWait(d)
+ return d
test_webPathname.timeout = 10
def _test_webPathname_1(self, page, p):
#print page
@@ -179,7 +179,7 @@
d = client.getPage("http://localhost:%d/remote/" % p.portnum)
d.addCallback(self._test_webPathname_port_1, p)
- return maybeWait(d)
+ return d
test_webPathname_port.timeout = 10
def _test_webPathname_port_1(self, page, p):
self.failUnlessIn("BuildBot", page)
@@ -213,7 +213,7 @@
d = client.getPage("http://localhost:%d/" % port)
d.addCallback(self._test_waterfall_1)
- return maybeWait(d)
+ return d
test_waterfall.timeout = 10
def _test_waterfall_1(self, page):
self.failUnless(page)
@@ -316,7 +316,7 @@
self.master.loadConfig(geturl_config)
self.master.startService()
d = self.connectSlave(["b1"])
- return maybeWait(d)
+ return d
def tearDown(self):
stopHTTPLog()
@@ -340,7 +340,7 @@
noweb_config1 = geturl_config + "del c['buildbotURL']\n"
d = self.master.loadConfig(noweb_config1)
d.addCallback(self._testMissingBase_1)
- return maybeWait(d)
+ return d
def _testMissingBase_1(self, res):
s = self.status
self.assertNoURL(s)
@@ -367,7 +367,7 @@
d = self.doBuild("b1")
# maybe check IBuildSetStatus here?
d.addCallback(self._testBuild_1)
- return maybeWait(d)
+ return d
def _testBuild_1(self, res):
s = self.status
@@ -447,7 +447,7 @@
def test_logfile1(self):
d = client.getPage("http://localhost:%d/" % self.port)
d.addCallback(self._test_logfile1_1)
- return maybeWait(d)
+ return d
test_logfile1.timeout = 20
def _test_logfile1_1(self, page):
self.failUnless(page)
@@ -456,7 +456,7 @@
logurl = self.getLogURL("setup", 0)
d = client.getPage(logurl)
d.addCallback(self._test_logfile2_1)
- return maybeWait(d)
+ return d
def _test_logfile2_1(self, logbody):
self.failUnless(logbody)
@@ -464,7 +464,7 @@
logurl = self.getLogURL("setup", 0)
d = client.getPage(logurl + "/text")
d.addCallback(self._test_logfile3_1)
- return maybeWait(d)
+ return d
def _test_logfile3_1(self, logtext):
self.failUnlessEqual(logtext, "some stdout\n")
@@ -472,7 +472,7 @@
logurl = self.getLogURL("setup", 1)
d = client.getPage(logurl)
d.addCallback(self._test_logfile4_1)
- return maybeWait(d)
+ return d
def _test_logfile4_1(self, logbody):
self.failUnlessEqual(logbody, "<html>ouch</html>")
@@ -487,7 +487,7 @@
c = reactor.connectTCP("localhost", self.port, f)
d = p.d
d.addCallback(self._test_logfile5_1, p)
- return maybeWait(d, 10)
+ return d
test_logfile5.timeout = 10
def _test_logfile5_1(self, res, p):
self.failUnlessIn("big log", p.data)
@@ -504,7 +504,7 @@
c = reactor.connectTCP("localhost", self.port, f)
d = p.d
d.addCallback(self._test_logfile6_1, p)
- return maybeWait(d, 10)
+ return d
test_logfile6.timeout = 10
def _test_logfile6_1(self, res, p):
self.failUnlessIn("big2 log", p.data)
More information about the Commits
mailing list