[Buildbot-commits] buildbot/buildbot/process builder.py,1.44,1.45

[Brian Warner]

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

Modified Files:
	builder.py 
Log Message:
[project @ test_slaves.py: fix an intermittent failure, disappeared slaves were reconnecting]

Original author: warner at lothar.com
Date: 2007-07-03 02:21:43+00:00

Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/builder.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- builder.py	2 Jul 2007 17:50:17 -0000	1.44
+++ builder.py	3 Jul 2007 02:22:19 -0000	1.45
@@ -26,6 +26,17 @@
         self.ping_watchers = []
         self.state = ATTACHING
         self.remote = None
+        self.slave = None
+        self.builder_name = None
+
+    def __repr__(self):
+        r = "<SlaveBuilder"
+        if self.builder_name:
+            r += " builder=%s" % self.builder_name
+        if self.slave:
+            r += " slave=%s" % self.slave.slavename
+        r += ">"
+        return r
 
     def setBuilder(self, b):
         self.builder = b
@@ -551,7 +562,7 @@
         self.building.append(build)
         self.updateBigStatus()
 
-        log.msg("starting build %s.. pinging the slave" % build)
+        log.msg("starting build %s.. pinging the slave %s" % (build, sb))
         # ping the slave to make sure they're still there. If they're fallen
         # off the map (due to a NAT timeout or something), this will fail in
         # a couple of minutes, depending upon the TCP timeout. TODO: consider