[Buildbot-commits] buildbot ChangeLog,1.564,1.565 Makefile,1.17,1.18

[Brian Warner]

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

Modified Files:
	ChangeLog Makefile 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-452
Creator:  Brian Warner <warner at monolith.lothar.com>

fix a bug: config-file reload would half-clobber all Schedulers

	* buildbot/master.py (BuildMaster): remove the .schedulers
	attribute, replacing it with an allSchedulers() method that looks
	for all IService children that implement IScheduler. Having only
	one parent/child relationship means fewer opportunities for bugs.
	(BuildMaster.allSchedulers): new method
	(BuildMaster.loadConfig_Schedulers): update to use allSchedulers,
	also fix ugly bug that caused any config-file reload to
	half-forget about the earlier Schedulers, causing an exception
	when a Change arrived and was handed to a half-connected
	Scheduler. The exception was in scheduler.py line 54ish:
	  self.parent.submitBuildSet(bs)
	  exceptions.AttributeError: 'NoneType' object has no attribute
	  'submitBuildSet'
	(BuildMaster.addChange): update to use allSchedulers()

	* buildbot/scheduler.py (BaseScheduler.__implements__): fix this
	to work properly with twisted-1.3.0, where you must explicitly
	include the __implements__ from parent classes
	(BaseScheduler.__repr__): make it easier to distinguish distinct
	instances
	(BaseUpstreamScheduler.__implements__): same

	* buildbot/status/builder.py (Status.getSchedulers): update to
	use allSchedulers()
	* buildbot/test/test_run.py (Run.testMaster): same
	* buildbot/test/test_dependencies.py (Dependencies.findScheduler): same
	* buildbot/test/test_config.py (ConfigTest.testSchedulers): same,
	make sure Scheduler instances are left alone when an identical
	config file is reloaded
	(ConfigElements.testSchedulers): make sure Schedulers are properly
	comparable

	* Makefile (TRIALARGS): my local default Twisted version is now
	2.1.0, update the trial arguments accordingly


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -d -r1.564 -r1.565
--- ChangeLog	22 Dec 2005 21:00:01 -0000	1.564
+++ ChangeLog	3 Jan 2006 09:26:41 -0000	1.565
@@ -1,3 +1,40 @@
+2006-01-03  Brian Warner  <warner at lothar.com>
+
+	* buildbot/master.py (BuildMaster): remove the .schedulers
+	attribute, replacing it with an allSchedulers() method that looks
+	for all IService children that implement IScheduler. Having only
+	one parent/child relationship means fewer opportunities for bugs.
+	(BuildMaster.allSchedulers): new method
+	(BuildMaster.loadConfig_Schedulers): update to use allSchedulers,
+	also fix ugly bug that caused any config-file reload to
+	half-forget about the earlier Schedulers, causing an exception
+	when a Change arrived and was handed to a half-connected
+	Scheduler. The exception was in scheduler.py line 54ish:
+	  self.parent.submitBuildSet(bs)
+	  exceptions.AttributeError: 'NoneType' object has no attribute
+	  'submitBuildSet'
+	(BuildMaster.addChange): update to use allSchedulers()
+
+	* buildbot/scheduler.py (BaseScheduler.__implements__): fix this
+	to work properly with twisted-1.3.0, where you must explicitly
+	include the __implements__ from parent classes
+	(BaseScheduler.__repr__): make it easier to distinguish distinct
+	instances
+	(BaseUpstreamScheduler.__implements__): same
+
+	* buildbot/status/builder.py (Status.getSchedulers): update to
+	use allSchedulers()
+	* buildbot/test/test_run.py (Run.testMaster): same
+	* buildbot/test/test_dependencies.py (Dependencies.findScheduler): same
+	* buildbot/test/test_config.py (ConfigTest.testSchedulers): same,
+	make sure Scheduler instances are left alone when an identical
+	config file is reloaded
+	(ConfigElements.testSchedulers): make sure Schedulers are properly
+	comparable
+
+	* Makefile (TRIALARGS): my local default Twisted version is now
+	2.1.0, update the trial arguments accordingly
+
 2005-12-22  Brian Warner  <warner at lothar.com>
 
 	* docs/examples/twisted_master.cfg: merge changes from pyr: add

Index: Makefile
===================================================================
RCS file: /cvsroot/buildbot/buildbot/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	25 Nov 2005 00:36:41 -0000	1.17
+++ Makefile	3 Jan 2006 09:26:41 -0000	1.18
@@ -3,7 +3,7 @@
 # process a little bit. This Makefile is not included in the source tarball.
 
 BBBASE = $(PWD)
-TRIALARGS=-v
+TRIALARGS=
 ifdef SVN
 T=~/stuff/python/twisted/Twisted
 TRIALARGS=--reporter=verbose
@@ -12,6 +12,7 @@
 endif
 ifdef T13
 T=~/stuff/python/twisted/Twisted-1.3.0
+TRIALARGS=-v
 endif
 PP = PYTHONPATH=$(BBBASE):$(T)