[Buildbot-commits] buildbot/buildbot/test test_config.py, 1.50, 1.51 test_control.py, 1.18, 1.19 test_dependencies.py, 1.8, 1.9 test_locks.py, 1.10, 1.11 test_properties.py, 1.10, 1.11 test_run.py, 1.46, 1.47 test_slaves.py, 1.11, 1.12 test_status.py, 1.44, 1.45 test_steps.py, 1.42, 1.43 test_vc.py, 1.77, 1.78 test_web.py, 1.47, 1.48
Brian Warner
warner at users.sourceforge.net
Tue Aug 7 19:21:42 UTC 2007
Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17293/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 @ move BuildSlave to new class, merge with BotPerspective, make it long-lived]
Original author: warner at lothar.com
Date: 2007-08-07 19:18:50+00:00
Index: test_config.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_config.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- test_config.py 2 Aug 2007 00:07:18 -0000 1.50
+++ test_config.py 7 Aug 2007 19:21:40 -0000 1.51
@@ -29,6 +29,7 @@
emptyCfg = \
"""
+from buildbot.buildslave import BuildSlave
BuildmasterConfig = c = {}
c['slaves'] = []
c['schedulers'] = []
@@ -42,7 +43,7 @@
buildersCfg = \
"""
from buildbot.process.factory import BasicBuildFactory
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
BuildmasterConfig = c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
c['schedulers'] = []
@@ -151,7 +152,7 @@
interlockCfgBad = \
"""
from buildbot.process.factory import BasicBuildFactory
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
c['schedulers'] = []
@@ -174,7 +175,7 @@
from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
c['schedulers'] = []
@@ -196,7 +197,7 @@
from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock, SlaveLock
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
c['schedulers'] = []
@@ -218,7 +219,7 @@
from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
c['schedulers'] = []
@@ -240,7 +241,7 @@
"""
from buildbot.process.factory import BasicBuildFactory
from buildbot.locks import MasterLock
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
c['schedulers'] = []
@@ -261,7 +262,7 @@
"""
from buildbot.process.factory import BasicBuildFactory
from buildbot.locks import MasterLock
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
c['schedulers'] = []
@@ -284,7 +285,7 @@
from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
c['schedulers'] = []
@@ -308,7 +309,7 @@
from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
c['schedulers'] = []
@@ -332,7 +333,7 @@
from buildbot.steps.dummy import Dummy
from buildbot.process.factory import BuildFactory, s
from buildbot.locks import MasterLock
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
c['schedulers'] = []
@@ -355,7 +356,7 @@
"""
from buildbot.scheduler import Scheduler, Dependent
from buildbot.process.factory import BasicBuildFactory
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
f1 = BasicBuildFactory('cvsroot', 'cvsmodule')
@@ -474,6 +475,9 @@
self.failUnlessEqual(master.botmaster.builders, {})
self.failUnlessEqual(master.checker.users,
{"change": "changepw"})
+ # 'botsCfg' is testing backwards compatibility, for 0.7.5 config
+ # files that have not yet been updated to 0.7.6 . This compatibility
+ # (and this test) is scheduled for removal in 0.8.0 .
botsCfg = (emptyCfg +
"c['bots'] = [('bot1', 'pw1'), ('bot2', 'pw2')]\n")
master.loadConfig(botsCfg)
@@ -490,7 +494,7 @@
self.failUnlessEqual(master.checker.users,
{"change": "changepw"})
slavesCfg = (emptyCfg +
- "from buildbot.slave import BuildSlave\n"
+ "from buildbot.buildslave import BuildSlave\n"
"c['slaves'] = [BuildSlave('bot1','pw1'), "
"BuildSlave('bot2','pw2')]\n")
master.loadConfig(slavesCfg)
@@ -1157,7 +1161,7 @@
from buildbot.process.factory import BuildFactory, s
from buildbot.steps.shell import ShellCommand
from buildbot.steps.source import Darcs
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
BuildmasterConfig = c = {}
c['slaves'] = [BuildSlave('bot1', 'pw1')]
c['schedulers'] = []
Index: test_control.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_control.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- test_control.py 1 Aug 2007 20:31:44 -0000 1.18
+++ test_control.py 7 Aug 2007 19:21:40 -0000 1.19
@@ -15,7 +15,7 @@
config = """
from buildbot.process import factory
from buildbot.steps import dummy
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
def s(klass, **kwargs):
return (klass, kwargs)
Index: test_dependencies.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_dependencies.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- test_dependencies.py 1 Aug 2007 20:31:27 -0000 1.8
+++ test_dependencies.py 7 Aug 2007 19:21:40 -0000 1.9
@@ -11,7 +11,7 @@
from buildbot import scheduler
from buildbot.process import factory
from buildbot.steps import dummy
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
s = factory.s
from buildbot.test.test_locks import LockStep
Index: test_locks.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_locks.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- test_locks.py 1 Aug 2007 20:31:27 -0000 1.10
+++ test_locks.py 7 Aug 2007 19:21:40 -0000 1.11
@@ -283,7 +283,7 @@
config_1 = """
from buildbot import locks
from buildbot.process import factory
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- test_properties.py 1 Aug 2007 20:31:27 -0000 1.10
+++ test_properties.py 7 Aug 2007 19:21:40 -0000 1.11
@@ -135,7 +135,7 @@
run_config = """
from buildbot.process import factory
from buildbot.steps.shell import ShellCommand, WithProperties
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
s = factory.s
BuildmasterConfig = c = {}
Index: test_run.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_run.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- test_run.py 1 Aug 2007 20:31:27 -0000 1.46
+++ test_run.py 7 Aug 2007 19:21:40 -0000 1.47
@@ -15,7 +15,7 @@
config_base = """
from buildbot.process import factory
from buildbot.steps import dummy
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
s = factory.s
f1 = factory.QuickBuildFactory('fakerep', 'cvsmodule', configure=None)
Index: test_slaves.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_slaves.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- test_slaves.py 1 Aug 2007 20:31:27 -0000 1.11
+++ test_slaves.py 7 Aug 2007 19:21:40 -0000 1.12
@@ -13,7 +13,7 @@
config_1 = """
from buildbot.process import factory
from buildbot.steps import dummy
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
s = factory.s
BuildmasterConfig = c = {}
@@ -191,7 +191,7 @@
config_3 = """
from buildbot.process import factory
from buildbot.steps import dummy
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
s = factory.s
BuildmasterConfig = c = {}
Index: test_status.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_status.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- test_status.py 1 Aug 2007 20:31:44 -0000 1.44
+++ test_status.py 7 Aug 2007 19:21:40 -0000 1.45
@@ -729,7 +729,7 @@
config_base = """
from buildbot.process import factory
from buildbot.steps import dummy
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
s = factory.s
f1 = factory.QuickBuildFactory('fakerep', 'cvsmodule', configure=None)
Index: test_steps.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_steps.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- test_steps.py 1 Aug 2007 20:31:27 -0000 1.42
+++ test_steps.py 7 Aug 2007 19:21:40 -0000 1.43
@@ -311,7 +311,7 @@
version_config = """
from buildbot.process import factory
from buildbot.test.test_steps import VersionCheckingStep
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
BuildmasterConfig = c = {}
f1 = factory.BuildFactory([
factory.s(VersionCheckingStep),
Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- test_vc.py 2 Aug 2007 00:07:18 -0000 1.77
+++ test_vc.py 7 Aug 2007 19:21:40 -0000 1.78
@@ -90,7 +90,7 @@
config_vc = """
from buildbot.process import factory
from buildbot.steps import source
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
s = factory.s
f1 = factory.BuildFactory([
Index: test_web.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_web.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- test_web.py 1 Aug 2007 22:08:37 -0000 1.47
+++ test_web.py 7 Aug 2007 19:21:40 -0000 1.48
@@ -288,7 +288,7 @@
from buildbot.steps import dummy
from buildbot.scheduler import Scheduler
from buildbot.changes.base import ChangeSource
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
s = factory.s
class DiscardScheduler(Scheduler):
@@ -393,7 +393,7 @@
config = """
from buildbot.status import html
from buildbot.process.factory import BasicBuildFactory
-from buildbot.slave import BuildSlave
+from buildbot.buildslave import BuildSlave
f1 = BasicBuildFactory('cvsroot', 'cvsmodule')
BuildmasterConfig = {
'slaves': [BuildSlave('bot1', 'passwd1')],
More information about the Commits
mailing list