[Buildbot-commits] buildbot/buildbot/test runutils.py, 1.15, 1.16 test_steps.py, 1.29, 1.30 test_web.py, 1.36, 1.37

[Brian Warner]

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

Modified Files:
	runutils.py test_steps.py test_web.py 
Log Message:
[project @ move b.p.step to b.p.buildstep, leaving step.py just for backwards compability]

Original author: warner at lothar.com
Date: 2006-09-17 19:47:55

Index: runutils.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/runutils.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- runutils.py	15 Sep 2006 14:49:46 -0000	1.15
+++ runutils.py	17 Sep 2006 20:35:49 -0000	1.16
@@ -9,7 +9,7 @@
 from buildbot.slave import bot
 from buildbot.process.builder import Builder
 from buildbot.process.base import BuildRequest, Build
-from buildbot.process.step import BuildStep
+from buildbot.process.buildstep import BuildStep
 from buildbot.sourcestamp import SourceStamp
 from buildbot.status import builder
 

Index: test_steps.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_steps.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- test_steps.py	15 Sep 2006 14:49:39 -0000	1.29
+++ test_steps.py	17 Sep 2006 20:35:49 -0000	1.30
@@ -20,7 +20,7 @@
 from twisted.internet import reactor, defer
 
 from buildbot.sourcestamp import SourceStamp
-from buildbot.process import step, base, factory
+from buildbot.process import buildstep, base, factory
 from buildbot.steps import shell, source
 from buildbot.status import builder
 from buildbot.status.builder import SUCCESS
@@ -98,7 +98,7 @@
         cmd = "argle bargle"
         dir = "murkle"
         expectedEvents = []
-        step.RemoteCommand.commandCounter[0] = 3
+        buildstep.RemoteCommand.commandCounter[0] = 3
         c = MyShellCommand(workdir=dir, command=cmd, build=self.build,
                            timeout=10)
         self.assertEqual(self.remote.events, expectedEvents)
@@ -159,7 +159,7 @@
         self.assertEqual(self.results, 0)
 
 
-class MyObserver(step.LogObserver):
+class MyObserver(buildstep.LogObserver):
     out = ""
     def outReceived(self, data):
         self.out = self.out + data
@@ -276,7 +276,7 @@
         self.failUnlessEqual(s.description, ["single string"])
         self.failUnlessEqual(s.descriptionDone, ["another string"])
 
-class VersionCheckingStep(step.BuildStep):
+class VersionCheckingStep(buildstep.BuildStep):
     def start(self):
         # give our test a chance to run. It is non-trivial for a buildstep to
         # claw its way back out to the test case which is currently running.
@@ -284,7 +284,7 @@
         checker = master._checker
         checker(self)
         # then complete
-        self.finished(step.SUCCESS)
+        self.finished(buildstep.SUCCESS)
 
 version_config = """
 from buildbot.process import factory
@@ -365,10 +365,10 @@
         from buildbot.process.step import RemoteDummy
 
 
-class _SimpleBuildStep(step.BuildStep):
+class _SimpleBuildStep(buildstep.BuildStep):
     def start(self):
         args = {"arg1": "value"}
-        cmd = step.RemoteCommand("simple", args)
+        cmd = buildstep.RemoteCommand("simple", args)
         d = self.runCommand(cmd)
         d.addCallback(lambda res: self.finished(SUCCESS))
 

Index: test_web.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_web.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- test_web.py	15 Sep 2006 14:47:41 -0000	1.36
+++ test_web.py	17 Sep 2006 20:35:49 -0000	1.37
@@ -15,7 +15,7 @@
 from buildbot.status import html, builder
 from buildbot.changes.changes import Change
 from buildbot.process import base
-from buildbot.process.step import BuildStep
+from buildbot.process.buildstep import BuildStep
 from buildbot.test.runutils import setupBuildStepStatus
 
 class ConfiguredMaster(master.BuildMaster):