Merge pull request #1678 from yetanotherion/master

test_stop_trigger: fix remote_interruptCommand no attribute error
buildbot · May 22, 2015 · 992e766 · 992e766
2 parents 1c1567d + 7c9a059
commit 992e766
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 9 deletions.
diff --git a/master/buildbot/buildslave/protocols/base.py b/master/buildbot/buildslave/protocols/base.py
@@ -74,7 +74,7 @@ def remoteShutdown(self):
     def remoteStartBuild(self, builderName):
         raise NotImplementedError
 
-    def remoteInterruptCommand(self, commandId, why):
+    def remoteInterruptCommand(self, builderName, commandId, why):
         raise NotImplementedError
 
 

diff --git a/master/buildbot/buildslave/protocols/null.py b/master/buildbot/buildslave/protocols/null.py
@@ -87,5 +87,6 @@ def remoteShutdown(self):
     def remoteStartBuild(self, builderName):
         return defer.succeed(self.buildslave.bot.builders[builderName].remote_startBuild())
 
-    def remoteInterruptCommand(self, commandId, why):
-        return defer.maybeDeferred(self.buildslave.bot.remote_interruptCommand, commandId, why)
+    def remoteInterruptCommand(self, builderName, commandId, why):
+        slavebuilder = self.buildslave.bot.builders[builderName]
+        return defer.maybeDeferred(slavebuilder.remote_interruptCommand, commandId, why)
diff --git a/master/buildbot/buildslave/protocols/pb.py b/master/buildbot/buildslave/protocols/pb.py
@@ -268,8 +268,9 @@ def remoteStartBuild(self, builderName):
         slavebuilder = self.builders.get(builderName)
         return slavebuilder.callRemote('startBuild')
 
-    def remoteInterruptCommand(self, commandId, why):
-        return defer.maybeDeferred(self.mind.callRemote, "interruptCommand",
+    def remoteInterruptCommand(self, builderName, commandId, why):
+        slavebuilder = self.builders.get(builderName)
+        return defer.maybeDeferred(slavebuilder.callRemote, "interruptCommand",
                                    commandId, why)
 
     # perspective methods called by the slave

diff --git a/master/buildbot/process/remotecommand.py b/master/buildbot/process/remotecommand.py
@@ -158,7 +158,8 @@ def interrupt(self, why):
         # tell the remote command to halt. Returns a Deferred that will fire
         # when the interrupt command has been delivered.
 
-        d = self.conn.remoteInterruptCommand(self.commandID, str(why))
+        d = self.conn.remoteInterruptCommand(self.builder_name,
+                                             self.commandID, str(why))
         # the slave may not have remote_interruptCommand
         d.addErrback(self._interruptFailed)
         return d

diff --git a/master/buildbot/test/fake/fakeprotocol.py b/master/buildbot/test/fake/fakeprotocol.py
@@ -59,6 +59,6 @@ def remoteStartBuild(self, builderName):
         self.remoteCalls.append(('remoteStartBuild', builderName))
         return defer.succeed(None)
 
-    def remoteInterruptCommand(self, commandId, why):
-        self.remoteCalls.append(('remoteInterruptCommand', commandId, why))
+    def remoteInterruptCommand(self, builderName, commandId, why):
+        self.remoteCalls.append(('remoteInterruptCommand', builderName, commandId, why))
         return defer.succeed(None)
diff --git a/master/buildbot/test/integration/test_stop_trigger.py b/master/buildbot/test/integration/test_stop_trigger.py
@@ -14,6 +14,7 @@
 # Copyright Buildbot Team Members
 
 from twisted.internet import defer
+from twisted.internet import reactor
 
 from buildbot.config import BuilderConfig
 from buildbot.plugins import schedulers
@@ -84,6 +85,8 @@ def nextBuild(*args, **kwargs):
 
 class TriggeringMaster(RunMasterBase):
     testCasesHandleTheirSetup = True
+    proto = "pb"
+
     change = dict(branch="master",
                   files=["foo.c"],
                   author="me@foo.com",
@@ -122,6 +125,23 @@ def newCallback(_, data):
                 self.higherBuild = None
         yield self.runTest(newCallback)
 
+    @defer.inlineCallbacks
+    def testTriggerRunsForeverAfterCmdStarted(self):
+        yield self.setupConfig("triggerRunsForever")
+        self.higherBuild = None
+
+        def newCallback(_, data):
+            if self.higherBuild is None:
+                self.higherBuild = data['buildid']
+            else:
+
+                def f():
+                    self.master.data.control("stop", {}, ("builds", self.higherBuild))
+                    self.higherBuild = None
+                reactor.callLater(5.0, f)
+
+        yield self.runTest(newCallback)
+
     @defer.inlineCallbacks
     def testTriggeredBuildIsNotCreated(self):
         yield self.setupConfig("triggeredBuildIsNotCreated")

diff --git a/master/buildbot/test/util/protocols.py b/master/buildbot/test/util/protocols.py
@@ -65,5 +65,5 @@ def remoteStartBuild(self, builderName):
 
     def test_sig_remoteInterruptCommand(self):
         @self.assertArgSpecMatches(self.conn.remoteInterruptCommand)
-        def remoteInterruptCommand(commandId, why):
+        def remoteInterruptCommand(builderName, commandId, why):
             pass