[Buildbot-commits] buildbot/buildbot/test test_config.py,1.30,1.31

[Brian Warner]

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

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

fix loadConfig_Sources to remove all old ones before adding new ones

	* Makefile (TRIALARGS): update to handle Twisted > 2.1.0

	* buildbot/master.py (BuildMaster.loadConfig_Sources): remove all
	deleted ChangeSources before adding any new ones
	* buildbot/changes/freshcvs.py (FreshCVSSourceNewcred): fix
	compare_attrs, to make sure that a config-file reload does not
	unnecessarily replace an unmodified ChangeSource instance
	* buildbot/test/test_config.py (ConfigTest.testSources): update


Index: test_config.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_config.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- test_config.py	15 Nov 2005 08:56:59 -0000	1.30
+++ test_config.py	25 Nov 2005 00:36:41 -0000	1.31
@@ -476,7 +476,8 @@
         self.failUnlessEqual(len(list(self.buildmaster.change_svc)), 1)
         s1 = list(self.buildmaster.change_svc)[0]
         self.failUnless(isinstance(s1, FreshCVSSource))
-        self.failUnlessEqual(s1.where, ("cvs.example.com", 1000))
+        self.failUnlessEqual(s1.host, "cvs.example.com")
+        self.failUnlessEqual(s1.port, 1000)
         self.failUnlessEqual(s1.prefix, "Prefix/")
         self.failUnlessEqual(s1, list(self.buildmaster.change_svc)[0])
         self.failUnless(s1.parent)