[Buildbot-commits] buildbot/buildbot/test test_runner.py,1.6,1.7

[Brian Warner]

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

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

make slave default to --keepalive=600

	* Makefile: improve permission-setting to not kick Arch so badly

	* buildbot/scripts/runner.py (SlaveOptions.optParameters): set a
	default --keepalive=600, since it doesn't hurt very much, and it's
	a hassle to discover that you need it.
	* buildbot/test/test_runner.py (Create.testSlave): test it


Index: test_runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_runner.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- test_runner.py	17 May 2005 20:04:08 -0000	1.6
+++ test_runner.py	18 May 2005 01:59:53 -0000	1.7
@@ -138,7 +138,7 @@
         self.failUnlessIn("port = 1234", tacfile)
         self.failUnlessIn("slavename = 'botname'", tacfile)
         self.failUnlessIn("passwd = 'passwd'", tacfile)
-        self.failUnlessIn("keepalive = 0", tacfile)
+        self.failUnlessIn("keepalive = 600", tacfile)
         self.failUnlessIn("BuildSlave(host, port, slavename", tacfile)
 
         makefile = os.path.join(basedir, "Makefile.sample")
@@ -171,7 +171,7 @@
 
         # now run it again (with different options)
         options = runner.SlaveOptions()
-        options.parseOptions(["-q", "--keepalive", "600",
+        options.parseOptions(["-q", "--keepalive", "30",
                               basedir, "buildmaster:9999",
                               "newbotname", "passwd"])
         runner.createSlave(options)
@@ -186,7 +186,7 @@
         self.failUnlessIn("port = 9999", tacfile)
         self.failUnlessIn("slavename = 'newbotname'", tacfile)
         self.failUnlessIn("passwd = 'passwd'", tacfile)
-        self.failUnlessIn("keepalive = 600", tacfile)
+        self.failUnlessIn("keepalive = 30", tacfile)
         self.failUnlessIn("BuildSlave(host, port, slavename", tacfile)
 
         make = open(os.path.join(basedir, "Makefile.sample"), "rt").read()