[Buildbot-commits] buildbot/buildbot master.py,1.76,1.77

[Brian Warner]

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

Modified Files:
	master.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-258
Creator:  Brian Warner <warner at lothar.com>

oops, update sanity-checking to handle Dependent instances

	* buildbot/master.py (BuildMaster.loadConfig): oops, sanity-check
	c['schedulers'] in such a way that we can actually accept
	Dependent instances
	* buildbot/test/test_config.py: check it


Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- master.py	20 Jul 2005 04:21:57 -0000	1.76
+++ master.py	20 Jul 2005 05:07:46 -0000	1.77
@@ -714,16 +714,16 @@
 
         assert type(sources) in (list, tuple)
         for s in sources:
-            assert interfaces.IChangeSource(s)
+            assert interfaces.IChangeSource(s, None)
         # this assertion catches c['schedulers'] = Scheduler(), since
         # Schedulers are service.MultiServices and thus iterable.
         assert type(schedulers) in (list, tuple)
         for s in schedulers:
-            assert (interfaces.IScheduler(s)
-                    or interfaces.IUpstreamScheduler(s))
+            assert (interfaces.IScheduler(s, None)
+                    or interfaces.IUpstreamScheduler(s, None))
         assert type(status) in (list, tuple)
         for s in status:
-            assert interfaces.IStatusReceiver(s)
+            assert interfaces.IStatusReceiver(s, None)
 
         slavenames = [name for name,pw in bots]
         buildernames = []
@@ -866,7 +866,7 @@
     def loadConfig_Schedulers(self, newschedulers):
         old = [s for s in self.schedulers if s not in newschedulers]
         [self.schedulers.remove(s) for s in old]
-        dl = [s.disownServiceParent() for s in old]
+        dl = [defer.maybeDeferred(s.disownServiceParent) for s in old]
         [s.setServiceParent(self)
          for s in newschedulers if s not in self.schedulers]
         self.schedulers = newschedulers