[Buildbot-commits] buildbot/buildbot/test test_runner.py, 1.13, 1.14

[Brian Warner]

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

Modified Files:
	test_runner.py 
Log Message:
[project @ in the buildslave .tac file, rename 'host' to 'buildmaster_host']

Original author: warner at lothar.com
Date: 2007-07-02 17:37:12+00:00

Index: test_runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_runner.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- test_runner.py	6 Sep 2006 00:41:55 -0000	1.13
+++ test_runner.py	2 Jul 2007 17:44:49 -0000	1.14
@@ -163,12 +163,13 @@
         self.failUnless(os.path.exists(tac))
         tacfile = open(tac,"rt").read()
         self.failUnlessIn("basedir", tacfile)
-        self.failUnlessIn("host = 'buildmaster'", tacfile)
+        self.failUnlessIn("buildmaster_host = 'buildmaster'", tacfile)
         self.failUnlessIn("port = 1234", tacfile)
         self.failUnlessIn("slavename = 'botname'", tacfile)
         self.failUnlessIn("passwd = 'passwd'", tacfile)
         self.failUnlessIn("keepalive = 600", tacfile)
-        self.failUnlessIn("BuildSlave(host, port, slavename", tacfile)
+        self.failUnlessIn("BuildSlave(buildmaster_host, port, slavename",
+                          tacfile)
 
         makefile = os.path.join(basedir, "Makefile.sample")
         self.failUnlessExists(makefile)
@@ -211,12 +212,13 @@
         self.failUnlessExists(os.path.join(basedir, "buildbot.tac.new"))
         tacfile = open(os.path.join(basedir, "buildbot.tac.new"),"rt").read()
         self.failUnlessIn("basedir", tacfile)
-        self.failUnlessIn("host = 'buildmaster'", tacfile)
+        self.failUnlessIn("buildmaster_host = 'buildmaster'", tacfile)
         self.failUnlessIn("port = 9999", tacfile)
         self.failUnlessIn("slavename = 'newbotname'", tacfile)
         self.failUnlessIn("passwd = 'passwd'", tacfile)
         self.failUnlessIn("keepalive = 30", tacfile)
-        self.failUnlessIn("BuildSlave(host, port, slavename", tacfile)
+        self.failUnlessIn("BuildSlave(buildmaster_host, port, slavename",
+                          tacfile)
 
         make = open(os.path.join(basedir, "Makefile.sample"), "rt").read()
         self.failUnlessEqual(make, oldmake, "*should* rewrite Makefile.sample")