[Buildbot-commits] buildbot/buildbot/test test_runner.py,1.11,1.12

Brian Warner warner at users.sourceforge.net
Sat Oct 22 23:22:12 UTC 2005

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

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

handle older slaves better (mostly multiple-branch support)

	* buildbot/test/test_runner.py (Options.testForceOptions): skip
	when running under older pythons (<2.3) in which the shlex module
	doesn't have a 'split' function.

	* buildbot/process/step.py (ShellCommand.start): make
	errorMessages= be a list of strings to stuff in the log before the
	command actually starts. This makes it easier to flag multiple
	warning messages, e.g. when the Source steps have to deal with an
	old buildslave.
	(CVS.startVC): handle slaves that don't handle multiple branches
	by switching into 'clobber' mode
	(SVN.startVC): same. Also reject branches without base_url
	(Darcs.startVC): same. Also reject revision= in older slaves
	(Arch.checkSlaveVersion): same (just the multiple-branches stuff)
	(Bazaar.startVC): same, and test for baz separately than for arch

Index: test_runner.py
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_runner.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- test_runner.py	21 Oct 2005 08:03:38 -0000	1.11
+++ test_runner.py	22 Oct 2005 23:22:10 -0000	1.12
@@ -51,6 +51,9 @@
     def testForceOptions(self):
+        if not hasattr(shlex, "split"):
+            raise unittest.SkipTest("need python>=2.3 for shlex.split")
         exp = {"builder": "b1", "reason": "reason",
                "branch": None, "revision": None}
         self.doForce(shlex.split("b1 reason"), exp)

More information about the Commits mailing list