Changeset 653

Timestamp:

06/01/08 09:34:09 (6 months ago)

Author:

dustin@v.igoro.us

Message:

#278:enhancedBuildSlavesPage-v2.diff
short patch by Ben Hearsum to make the /buildslaves WebStatus?? page
a little more useful. It does do things: 1) bolds the 'slave is NOT
connected' line to make it more visible 2) shows whether each slave
is busy (building) or not

Files:

• buildbot/buildslave.py (modified) (1 diff)
• buildbot/process/base.py (modified) (2 diffs)
• buildbot/status/builder.py (modified) (3 diffs)
• buildbot/status/web/slaves.py (modified) (2 diffs)
• buildbot/test/test_slaves.py (modified) (3 diffs)

buildbot/buildslave.py

@@ -96 +96 @@
-            return self.sendBuilderList()
-        return defer.succeed(None)
+
+    def updateSlaveStatus(self, buildStarted=None, buildFinished=None):
+        if buildStarted:
+            self.slave_status.buildStarted(buildStarted)
+        if buildFinished:
+            self.slave_status.buildFinished(buildFinished)
-
-    def attached(self, bot):

buildbot/process/base.py

@@ -310 +310 @@
-        self.setupProperties()
-        self.setupSlaveBuilder(slavebuilder)
+        slavebuilder.slave.updateSlaveStatus(buildStarted=build_status)
-
-        # convert all locks into their real forms
@@ -319 +320 @@
-        self.remote.notifyOnDisconnect(self.lostRemote)
-        d = self.deferred = defer.Deferred()
-
+, slave, bs
-            self.slavebuilder.buildFinished()
+            slave.updateSlaveStatus(buildFinished=bs)
-            return res
-
+, self.slavebuilder.slave, build_status
-
-        try:

buildbot/status/builder.py

@@ -1744 +1744 @@
-        self.name = name
-        self._lastMessageReceived = 0
+        self.runningBuilds = []
-
-    def getName(self):
@@ -1755 +1756 @@
-    def lastMessageReceived(self):
-        return self._lastMessageReceived
+    def getRunningBuilds(self):
+        return self.runningBuilds
-
-    def setAdmin(self, admin):
@@ -1764 +1767 @@
-    def setLastMessageReceived(self, when):
-        self._lastMessageReceived = when
+
+    def buildStarted(self, build):
+        self.runningBuilds.append(build)
+    def buildFinished(self, build):
+        self.runningBuilds.remove(build)
-
-class Status:

buildbot/status/web/slaves.py

@@ -29 +29 @@
-        for name in s.getSlaveNames():
-            slave = s.getSlave(name)
+            slave_status = s.botmaster.slaves[name].slave_status
+            isBusy = len(slave_status.getRunningBuilds())
-            data += " <li>%s:\n" % name
-            data += " <ul>\n"
@@ -54 +56 @@
-                    data += '<font size="-1">(%s)</font>' % lt
-                    data += "</li>\n"
+                    if isBusy:
+                        data += "<li>Slave is currently building.</li>"
+                    else:
+                        data += "<li>Slave is idle.</li>"
-            else:
-Slave is NOT currently connected
+<b>Slave is NOT currently connected</b>
-
-            data += " </ul>\n"

buildbot/test/test_slaves.py

@@ -27 +27 @@
-f1 = factory.BuildFactory([s(dummy.RemoteDummy, timeout=1)])
-f2 = factory.BuildFactory([s(dummy.RemoteDummy, timeout=2)])
+f3 = factory.BuildFactory([s(dummy.RemoteDummy, timeout=3)])
+f4 = factory.BuildFactory([s(dummy.RemoteDummy, timeout=5)])
-
-c['builders'] = [
@@ -41 +43 @@
-    ]
-
+"""
+
+config_busyness = config_1 + """
+c['builders'] = [
+    {'name': 'b1', 'slavenames': ['bot1'],
+     'builddir': 'b1', 'factory': f3},
+    {'name': 'b2', 'slavenames': ['bot1'],
+     'builddir': 'b2', 'factory': f4},
+    ]
-"""
-
@@ -189 +200 @@
-    def _testDontClaimPingingSlave_3(self, res):
-        self.failUnlessEqual(res.getSlavename(), "bot1")
+
+
+class SlaveBusyness(RunMixin, unittest.TestCase):
+
+    def setUp(self):
+        RunMixin.setUp(self)
+        self.master.loadConfig(config_busyness)
+        self.master.startService()
+        d = self.connectSlave(["b1", "b2"])
+        return d
+
+    def doBuild(self, buildername):
+        br = BuildRequest("forced", SourceStamp())
+        d = br.waitUntilFinished()
+        self.control.getBuilder(buildername).requestBuild(br)
+        return d
+
+    def getRunningBuilds(self):
+        return len(self.status.getSlave("bot1").getRunningBuilds())
+
+    def testSlaveNotBusy(self):
+        self.failUnlessEqual(self.getRunningBuilds(), 0)
+        # now kick a build, wait for it to finish, then check again
+        d = self.doBuild("b1")
+        d.addCallback(self._testSlaveNotBusy_1)
+        return d
+
+    def _testSlaveNotBusy_1(self, res):
+        self.failUnlessEqual(self.getRunningBuilds(), 0)
+
+    def testSlaveBusyOneBuild(self):
+        d1 = self.doBuild("b1")
+        d2 = defer.Deferred()
+        reactor.callLater(.5, d2.callback, None)
+        d2.addCallback(self._testSlaveBusyOneBuild_1)
+        d1.addCallback(self._testSlaveBusyOneBuild_finished_1)
+        return defer.DeferredList([d1,d2])
+
+    def _testSlaveBusyOneBuild_1(self, res):
+        self.failUnlessEqual(self.getRunningBuilds(), 1)
+
+    def _testSlaveBusyOneBuild_finished_1(self, res):
+        self.failUnlessEqual(self.getRunningBuilds(), 0)
+
+    def testSlaveBusyTwoBuilds(self):
+        d1 = self.doBuild("b1")
+        d2 = self.doBuild("b2")
+        d3 = defer.Deferred()
+        reactor.callLater(.5, d3.callback, None)
+        d3.addCallback(self._testSlaveBusyTwoBuilds_1)
+        d1.addCallback(self._testSlaveBusyTwoBuilds_finished_1, d2)
+        return defer.DeferredList([d1,d3])
+
+    def _testSlaveBusyTwoBuilds_1(self, res):
+        self.failUnlessEqual(self.getRunningBuilds(), 2)
+
+    def _testSlaveBusyTwoBuilds_finished_1(self, res, d2):
+        self.failUnlessEqual(self.getRunningBuilds(), 1)
+        d2.addCallback(self._testSlaveBusyTwoBuilds_finished_2)
+        return d2
+
+    def _testSlaveBusyTwoBuilds_finished_2(self, res):
+        self.failUnlessEqual(self.getRunningBuilds(), 0)
+
+    def testSlaveDisconnect(self):
+        d1 = self.doBuild("b1")
+        d2 = defer.Deferred()
+        reactor.callLater(.5, d2.callback, None)
+        d2.addCallback(self._testSlaveDisconnect_1)
+        d1.addCallback(self._testSlaveDisconnect_finished_1)
+        return defer.DeferredList([d1, d2])
+
+    def _testSlaveDisconnect_1(self, res):
+        self.failUnlessEqual(self.getRunningBuilds(), 1)
+        return self.shutdownAllSlaves()
+
+    def _testSlaveDisconnect_finished_1(self, res):
+        self.failUnlessEqual(self.getRunningBuilds(), 0)
-
-config_3 = """