[Buildbot-commits] buildbot/buildbot/test test_run.py,1.24,1.25

[Brian Warner]

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

Modified Files:
	test_run.py 
Log Message:
* buildbot/process/builder.py (Builder.attached): always return a
Deferred, even if the builder was already attached
* buildbot/test/test_run.py (Basedir.testChangeBuilddir): test it


Index: test_run.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_run.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- test_run.py	24 Apr 2005 21:30:25 -0000	1.24
+++ test_run.py	26 Apr 2005 07:16:35 -0000	1.25
@@ -122,6 +122,27 @@
 BuildmasterConfig = c
 """
 
+config_4_newbuilder = """
+from buildbot.process import factory, step
+
+def s(klass, **kwargs):
+    return (klass, kwargs)
+
+f1 = factory.BuildFactory([
+    s(step.Dummy, timeout=1),
+    s(step.RemoteDummy, timeout=2),
+    ])
+c = {}
+c['bots'] = [['bot1', 'sekrit']]
+c['sources'] = []
+c['builders'] = [{'name': 'dummy', 'slavename': 'bot1',
+                  'builddir': 'dummy2', 'factory': f1},
+                 {'name': 'dummy2', 'slavename': 'bot1',
+                  'builddir': 'dummy23', 'factory': f1},]
+c['slavePortnum'] = 0
+BuildmasterConfig = c
+"""
+
 class MyBot(bot.Bot):
     def remote_getSlaveInfo(self):
         return self.parent.info
@@ -770,6 +791,8 @@
         self.failUnlessEqual(builder.builddir, "dummy2")
         self.failUnlessEqual(builder.basedir, "slavebase/dummy2")
 
-        # done
-
+        # add a new builder, which causes the basedir list to be reloaded
+        d = m.loadConfig(config_4_newbuilder)
+        dr(d)
+