[Buildbot-commits] buildbot/buildbot/test test_config.py, 1.37, 1.38 test_control.py, 1.11, 1.12 test_dependencies.py, 1.4, 1.5 test_locks.py, 1.6, 1.7 test_properties.py, 1.4, 1.5 test_run.py, 1.39, 1.40 test_slaves.py, 1.3, 1.4 test_status.py, 1.32, 1.33 test_steps.py, 1.27, 1.28 test_vc.py, 1.67, 1.68 test_web.py, 1.35, 1.36
Brian Warner
warner at users.sourceforge.net
Fri Sep 15 14:47:44 UTC 2006
Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20685/buildbot/test
Modified Files:
test_config.py test_control.py test_dependencies.py
test_locks.py test_properties.py test_run.py test_slaves.py
test_status.py test_steps.py test_vc.py test_web.py
Log Message:
[project @ update docs, factories, and tests to use new buildbot/steps/* definitions]
Original author: warner at lothar.com
Date: 2006-09-08 21:25:42
Index: test_config.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_config.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- test_config.py 6 Sep 2006 00:41:55 -0000 1.37
+++ test_config.py 15 Sep 2006 14:47:41 -0000 1.38
@@ -23,7 +23,8 @@
from twisted.web.distrib import ResourcePublisher
from buildbot.process.builder import Builder
from buildbot.process.factory import BasicBuildFactory
-from buildbot.process import step
+from buildbot.steps.source import CVS
+from buildbot.steps.shell import Compile, Test
from buildbot.status import base
words = None
try:
@@ -80,19 +81,19 @@
wpCfg1 = buildersCfg + \
"""
-from buildbot.process import step
+from buildbot.steps import shell
f1 = BasicBuildFactory('cvsroot', 'cvsmodule')
-f1.addStep(step.ShellCommand, command=[step.WithProperties('echo')])
+f1.addStep(shell.ShellCommand, command=[shell.WithProperties('echo')])
c['builders'] = [{'name':'builder1', 'slavename':'bot1',
'builddir':'workdir1', 'factory': f1}]
"""
wpCfg2 = buildersCfg + \
"""
-from buildbot.process import step
+from buildbot.steps import shell
f1 = BasicBuildFactory('cvsroot', 'cvsmodule')
-f1.addStep(step.ShellCommand,
- command=[step.WithProperties('echo %s', 'revision')])
+f1.addStep(shell.ShellCommand,
+ command=[shell.WithProperties('echo %s', 'revision')])
c['builders'] = [{'name':'builder1', 'slavename':'bot1',
'builddir':'workdir1', 'factory': f1}]
"""
@@ -176,7 +177,7 @@
lockCfgBad1 = \
"""
-from buildbot.process.step import Dummy
+from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock
c = {}
@@ -198,7 +199,7 @@
lockCfgBad2 = \
"""
-from buildbot.process.step import Dummy
+from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock, SlaveLock
c = {}
@@ -220,7 +221,7 @@
lockCfgBad3 = \
"""
-from buildbot.process.step import Dummy
+from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock
c = {}
@@ -286,7 +287,7 @@
# test out step Locks
lockCfg2a = \
"""
-from buildbot.process.step import Dummy
+from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock
c = {}
@@ -310,7 +311,7 @@
lockCfg2b = \
"""
-from buildbot.process.step import Dummy
+from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock
c = {}
@@ -334,7 +335,7 @@
lockCfg2c = \
"""
-from buildbot.process.step import Dummy
+from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock
c = {}
@@ -661,13 +662,13 @@
self.failUnless(isinstance(f1, BasicBuildFactory))
steps = f1.steps
self.failUnlessEqual(len(steps), 3)
- self.failUnlessEqual(steps[0], (step.CVS,
+ self.failUnlessEqual(steps[0], (CVS,
{'cvsroot': 'cvsroot',
'cvsmodule': 'cvsmodule',
'mode': 'clobber'}))
- self.failUnlessEqual(steps[1], (step.Compile,
+ self.failUnlessEqual(steps[1], (Compile,
{'command': 'make all'}))
- self.failUnlessEqual(steps[2], (step.Test,
+ self.failUnlessEqual(steps[2], (Test,
{'command': 'make check'}))
Index: test_control.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_control.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- test_control.py 6 Sep 2006 00:41:55 -0000 1.11
+++ test_control.py 15 Sep 2006 14:47:41 -0000 1.12
@@ -14,13 +14,14 @@
from buildbot.test.runutils import rmtree
config = """
-from buildbot.process import factory, step
+from buildbot.process import factory
+from buildbot.steps import dummy
def s(klass, **kwargs):
return (klass, kwargs)
f1 = factory.BuildFactory([
- s(step.Dummy, timeout=1),
+ s(dummy.Dummy, timeout=1),
])
c = {}
c['bots'] = [['bot1', 'sekrit']]
Index: test_dependencies.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_dependencies.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test_dependencies.py 6 Sep 2006 00:41:55 -0000 1.4
+++ test_dependencies.py 15 Sep 2006 14:47:41 -0000 1.5
@@ -10,7 +10,8 @@
config_1 = """
from buildbot import scheduler
-from buildbot.process import step, factory
+from buildbot.process import factory
+from buildbot.steps import dummy
s = factory.s
from buildbot.test.test_locks import LockStep
@@ -33,9 +34,9 @@
s5 = scheduler.Dependent('downstream5', s4, ['b5'])
c['schedulers'] = [s1, s2, s3, s4, s5]
-f_fastpass = factory.BuildFactory([s(step.Dummy, timeout=1)])
-f_slowpass = factory.BuildFactory([s(step.Dummy, timeout=2)])
-f_fastfail = factory.BuildFactory([s(step.FailingDummy, timeout=1)])
+f_fastpass = factory.BuildFactory([s(dummy.Dummy, timeout=1)])
+f_slowpass = factory.BuildFactory([s(dummy.Dummy, timeout=2)])
+f_fastfail = factory.BuildFactory([s(dummy.FailingDummy, timeout=1)])
def builder(name, f):
d = {'name': name, 'slavename': 'bot1', 'builddir': name, 'factory': f}
Index: test_locks.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_locks.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- test_locks.py 6 Sep 2006 00:41:55 -0000 1.6
+++ test_locks.py 15 Sep 2006 14:47:41 -0000 1.7
@@ -6,7 +6,7 @@
from twisted.internet import defer, reactor
from buildbot import master
-from buildbot.process import step
+from buildbot.steps import dummy
from buildbot.sourcestamp import SourceStamp
from buildbot.process.base import BuildRequest
from buildbot.test.runutils import RunMixin
@@ -271,19 +271,19 @@
-class LockStep(step.Dummy):
+class LockStep(dummy.Dummy):
def start(self):
number = self.build.requests[0].number
self.build.requests[0].events.append(("start", number))
- step.Dummy.start(self)
+ dummy.Dummy.start(self)
def done(self):
number = self.build.requests[0].number
self.build.requests[0].events.append(("done", number))
- step.Dummy.done(self)
+ dummy.Dummy.done(self)
config_1 = """
from buildbot import locks
-from buildbot.process import step, factory
+from buildbot.process import factory
s = factory.s
from buildbot.test.test_locks import LockStep
Index: test_properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_properties.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test_properties.py 29 May 2006 00:10:38 -0000 1.4
+++ test_properties.py 15 Sep 2006 14:47:41 -0000 1.5
@@ -7,7 +7,7 @@
from buildbot.twcompat import maybeWait
from buildbot.sourcestamp import SourceStamp
from buildbot.process import base
-from buildbot.process.step import ShellCommand, WithProperties
+from buildbot.steps.shell import ShellCommand, WithProperties
from buildbot.status import builder
from buildbot.slave.commands import rmdirRecursive
from buildbot.test.runutils import RunMixin
@@ -118,8 +118,8 @@
run_config = """
-from buildbot.process import step, factory
-from buildbot.process.step import ShellCommand, WithProperties
+from buildbot.process import factory
+from buildbot.steps.shell import ShellCommand, WithProperties
s = factory.s
BuildmasterConfig = c = {}
@@ -134,7 +134,7 @@
# zombie and the step never completes. To keep this from messing up the unit
# tests too badly, this step runs with a reduced timeout.
-f1 = factory.BuildFactory([s(step.ShellCommand,
+f1 = factory.BuildFactory([s(ShellCommand,
flunkOnFailure=True,
command=['touch',
WithProperties('%s-slave', 'slavename'),
Index: test_run.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_run.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- test_run.py 6 Sep 2006 00:41:55 -0000 1.39
+++ test_run.py 15 Sep 2006 14:47:41 -0000 1.40
@@ -14,14 +14,15 @@
from buildbot.test.runutils import RunMixin, rmtree
config_base = """
-from buildbot.process import factory, step
+from buildbot.process import factory
+from buildbot.steps import dummy
s = factory.s
f1 = factory.QuickBuildFactory('fakerep', 'cvsmodule', configure=None)
f2 = factory.BuildFactory([
- s(step.Dummy, timeout=1),
- s(step.RemoteDummy, timeout=2),
+ s(dummy.Dummy, timeout=1),
+ s(dummy.RemoteDummy, timeout=2),
])
BuildmasterConfig = c = {}
Index: test_slaves.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_slaves.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- test_slaves.py 20 Oct 2005 22:25:29 -0000 1.3
+++ test_slaves.py 15 Sep 2006 14:47:41 -0000 1.4
@@ -10,7 +10,8 @@
from buildbot.status.builder import SUCCESS
config_1 = """
-from buildbot.process import step, factory
+from buildbot.process import factory
+from buildbot.steps import dummy
s = factory.s
BuildmasterConfig = c = {}
@@ -20,7 +21,7 @@
c['slavePortnum'] = 0
c['schedulers'] = []
-f = factory.BuildFactory([s(step.RemoteDummy, timeout=1)])
+f = factory.BuildFactory([s(dummy.RemoteDummy, timeout=1)])
c['builders'] = [
{'name': 'b1', 'slavenames': ['bot1','bot2','bot3'],
Index: test_status.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_status.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- test_status.py 6 Sep 2006 00:41:55 -0000 1.32
+++ test_status.py 15 Sep 2006 14:47:41 -0000 1.33
@@ -699,14 +699,15 @@
testLargeSummary.timeout = 5
config_base = """
-from buildbot.process import factory, step
+from buildbot.process import factory
+from buildbot.steps import dummy
s = factory.s
f1 = factory.QuickBuildFactory('fakerep', 'cvsmodule', configure=None)
f2 = factory.BuildFactory([
- s(step.Dummy, timeout=1),
- s(step.RemoteDummy, timeout=2),
+ s(dummy.Dummy, timeout=1),
+ s(dummy.RemoteDummy, timeout=2),
])
BuildmasterConfig = c = {}
Index: test_steps.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_steps.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- test_steps.py 9 Sep 2006 06:20:50 -0000 1.27
+++ test_steps.py 15 Sep 2006 14:47:41 -0000 1.28
@@ -22,7 +22,7 @@
from buildbot.sourcestamp import SourceStamp
from buildbot.process import step, base, factory
-from buildbot.process.step import ShellCommand #, ShellCommands
+from buildbot.steps import shell, source
from buildbot.status import builder
from buildbot.test.runutils import RunMixin, rmtree
from buildbot.test.runutils import makeBuildStep
@@ -30,12 +30,12 @@
from buildbot.slave import commands
-class MyShellCommand(ShellCommand):
+class MyShellCommand(shell.ShellCommand):
started = False
def runCommand(self, c):
self.started = True
self.rc = c
- return ShellCommand.runCommand(self, c)
+ return shell.ShellCommand.runCommand(self, c)
class FakeBuild:
pass
@@ -167,13 +167,13 @@
class Steps(unittest.TestCase):
def testMultipleStepInstances(self):
steps = [
- (step.CVS, {'cvsroot': "root", 'cvsmodule': "module"}),
- (step.Configure, {'command': "./configure"}),
- (step.Compile, {'command': "make"}),
- (step.Compile, {'command': "make more"}),
- (step.Compile, {'command': "make evenmore"}),
- (step.Test, {'command': "make test"}),
- (step.Test, {'command': "make testharder"}),
+ (source.CVS, {'cvsroot': "root", 'cvsmodule': "module"}),
+ (shell.Configure, {'command': "./configure"}),
+ (shell.Compile, {'command': "make"}),
+ (shell.Compile, {'command': "make more"}),
+ (shell.Compile, {'command': "make evenmore"}),
+ (shell.Test, {'command': "make test"}),
+ (shell.Test, {'command': "make testharder"}),
]
f = factory.ConfigurableBuildFactory(steps)
req = base.BuildRequest("reason", SourceStamp())
@@ -261,7 +261,7 @@
def test_description(self):
s = makeBuildStep("test_steps.Steps.test_description.1",
- step_class=ShellCommand,
+ step_class=shell.ShellCommand,
workdir="dummy",
description=["list", "of", "strings"],
descriptionDone=["another", "list"])
@@ -269,7 +269,7 @@
self.failUnlessEqual(s.descriptionDone, ["another", "list"])
s = makeBuildStep("test_steps.Steps.test_description.2",
- step_class=ShellCommand,
+ step_class=shell.ShellCommand,
workdir="dummy",
description="single string",
descriptionDone="another string")
@@ -287,7 +287,7 @@
self.finished(step.SUCCESS)
version_config = """
-from buildbot.process import factory, step
+from buildbot.process import factory
from buildbot.test.test_steps import VersionCheckingStep
BuildmasterConfig = c = {}
f1 = factory.BuildFactory([
Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- test_vc.py 6 Sep 2006 00:41:55 -0000 1.67
+++ test_vc.py 15 Sep 2006 14:47:41 -0000 1.68
@@ -18,7 +18,8 @@
from buildbot.slave import bot, commands
from buildbot.slave.commands import rmdirRecursive
from buildbot.status.builder import SUCCESS, FAILURE
-from buildbot.process import step, base
+from buildbot.process import base
+from buildbot.steps import source
from buildbot.changes import changes
from buildbot.sourcestamp import SourceStamp
from buildbot.twcompat import maybeWait, which
@@ -95,7 +96,8 @@
return d
config_vc = """
-from buildbot.process import factory, step
+from buildbot.process import factory
+from buildbot.steps import source
s = factory.s
f1 = factory.BuildFactory([
@@ -1183,7 +1185,7 @@
vc_name = "cvs"
metadir = "CVS"
- vctype = "step.CVS"
+ vctype = "source.CVS"
vctype_try = "cvs"
# CVS gives us got_revision, but it is based entirely upon the local
# clock, which means it is unlikely to match the timestamp taken earlier.
@@ -1326,7 +1328,7 @@
vc_name = "svn"
metadir = ".svn"
- vctype = "step.SVN"
+ vctype = "source.SVN"
vctype_try = "svn"
has_got_revision = True
has_got_revision_branches_are_merged = True
@@ -1495,7 +1497,7 @@
class P4(VCBase, unittest.TestCase):
metadir = None
- vctype = "step.P4"
+ vctype = "source.P4"
vc_name = "p4"
def tearDownClass(self):
@@ -1624,7 +1626,7 @@
# Darcs has a metadir="_darcs", but it does not have an 'export'
# mode
metadir = None
- vctype = "step.Darcs"
+ vctype = "source.Darcs"
vctype_try = "darcs"
has_got_revision = True
@@ -1832,7 +1834,7 @@
# build will re-register the correct one for whichever test is
# currently being run.
- # except, that step.Bazaar really doesn't like it when the archive
+ # except, that source.Bazaar really doesn't like it when the archive
# gets unregistered behind its back. The slave tries to do a 'baz
# replay' in a tree with an archive that is no longer recognized, and
# baz aborts with a botched invariant exception. This causes
@@ -1911,7 +1913,7 @@
metadir = None
# Arch has a metadir="{arch}", but it does not have an 'export' mode.
- vctype = "step.Arch"
+ vctype = "source.Arch"
vctype_try = "tla"
has_got_revision = True
@@ -1981,7 +1983,7 @@
class Bazaar(Arch):
vc_name = "bazaar"
- vctype = "step.Bazaar"
+ vctype = "source.Bazaar"
vctype_try = "baz"
has_got_revision = True
@@ -2045,7 +2047,7 @@
self.site.resource = self.root
def testRetry(self):
- # we want to verify that step.Source(retry=) works, and the easiest
+ # we want to verify that source.Source(retry=) works, and the easiest
# way to make VC updates break (temporarily) is to break the HTTP
# server that's providing the repository. Anything else pretty much
# requires mutating the (read-only) BUILDBOT_TEST_VC repository, or
@@ -2220,7 +2222,7 @@
# Mercurial has a metadir=".hg", but it does not have an 'export' mode.
metadir = None
- vctype = "step.Mercurial"
+ vctype = "source.Mercurial"
vctype_try = "hg"
has_got_revision = True
@@ -2275,7 +2277,7 @@
def testCVS1(self):
r = base.BuildRequest("forced build", SourceStamp())
b = base.Build([r])
- s = step.CVS(cvsroot=None, cvsmodule=None, workdir=None, build=b)
+ s = source.CVS(cvsroot=None, cvsmodule=None, workdir=None, build=b)
self.failUnlessEqual(s.computeSourceRevision(b.allChanges()), None)
def testCVS2(self):
@@ -2287,7 +2289,7 @@
submitted = "Wed, 08 Sep 2004 09:04:00 -0700"
r.submittedAt = mktime_tz(parsedate_tz(submitted))
b = base.Build([r])
- s = step.CVS(cvsroot=None, cvsmodule=None, workdir=None, build=b)
+ s = source.CVS(cvsroot=None, cvsmodule=None, workdir=None, build=b)
self.failUnlessEqual(s.computeSourceRevision(b.allChanges()),
"Wed, 08 Sep 2004 16:03:00 -0000")
@@ -2300,8 +2302,8 @@
submitted = "Wed, 08 Sep 2004 09:04:00 -0700"
r.submittedAt = mktime_tz(parsedate_tz(submitted))
b = base.Build([r])
- s = step.CVS(cvsroot=None, cvsmodule=None, workdir=None, build=b,
- checkoutDelay=10)
+ s = source.CVS(cvsroot=None, cvsmodule=None, workdir=None, build=b,
+ checkoutDelay=10)
self.failUnlessEqual(s.computeSourceRevision(b.allChanges()),
"Wed, 08 Sep 2004 16:02:10 -0000")
@@ -2321,14 +2323,14 @@
r2.submittedAt = mktime_tz(parsedate_tz(submitted))
b = base.Build([r1, r2])
- s = step.CVS(cvsroot=None, cvsmodule=None, workdir=None, build=b)
+ s = source.CVS(cvsroot=None, cvsmodule=None, workdir=None, build=b)
self.failUnlessEqual(s.computeSourceRevision(b.allChanges()),
"Wed, 08 Sep 2004 16:06:00 -0000")
def testSVN1(self):
r = base.BuildRequest("forced", SourceStamp())
b = base.Build([r])
- s = step.SVN(svnurl="dummy", workdir=None, build=b)
+ s = source.SVN(svnurl="dummy", workdir=None, build=b)
self.failUnlessEqual(s.computeSourceRevision(b.allChanges()), None)
def testSVN2(self):
@@ -2338,7 +2340,7 @@
c.append(self.makeChange(revision=67))
r = base.BuildRequest("forced", SourceStamp(changes=c))
b = base.Build([r])
- s = step.SVN(svnurl="dummy", workdir=None, build=b)
+ s = source.SVN(svnurl="dummy", workdir=None, build=b)
self.failUnlessEqual(s.computeSourceRevision(b.allChanges()), 67)
class Patch(VCBase, unittest.TestCase):
Index: test_web.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_web.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- test_web.py 6 Sep 2006 00:41:55 -0000 1.35
+++ test_web.py 15 Sep 2006 14:47:41 -0000 1.36
@@ -14,7 +14,8 @@
from buildbot.twcompat import providedBy, maybeWait
from buildbot.status import html, builder
from buildbot.changes.changes import Change
-from buildbot.process import step, base
+from buildbot.process import base
+from buildbot.process.step import BuildStep
from buildbot.test.runutils import setupBuildStepStatus
class ConfiguredMaster(master.BuildMaster):
@@ -279,7 +280,8 @@
geturl_config = """
from buildbot.status import html
from buildbot.changes import mail
-from buildbot.process import step, factory
+from buildbot.process import factory
+from buildbot.steps import dummy
from buildbot.scheduler import Scheduler
from buildbot.changes.base import ChangeSource
s = factory.s
@@ -297,7 +299,7 @@
c['slavePortnum'] = 0
c['status'] = [html.Waterfall(http_port=0)]
-f = factory.BuildFactory([s(step.RemoteDummy, timeout=1)])
+f = factory.BuildFactory([s(dummy.RemoteDummy, timeout=1)])
c['builders'] = [
{'name': 'b1', 'slavenames': ['bot1','bot2'],
@@ -413,7 +415,7 @@
bs.setReason("reason")
bs.buildStarted(build1)
- step1 = step.BuildStep(build=build1, name="setup")
+ step1 = BuildStep(build=build1, name="setup")
bss = bs.addStepWithName("setup")
step1.setStepStatus(bss)
bss.stepStarted()
More information about the Commits
mailing list