Remove remoteShutdown's buildslave argument

The connection already has that object from the constructor.

master/buildbot/buildslave/base.py

@@ -538,7 +538,7 @@ def shutdown(self):
             log.msg("no remote; slave is already shut down")
             return
 
-        yield self.conn.remoteShutdown(self)
+        yield self.conn.remoteShutdown()
 
     def maybeShutdown(self):
         """Shut down this slave if it has been asked to shut down gracefully,

master/buildbot/buildslave/protocols/base.py

@@ -58,7 +58,7 @@ def remoteSetBuilderList(self, builders):
     def startCommands(self, remoteCommand, builderName, commandId, commandName, args):
         raise NotImplementedError
 
-    def remoteShutdown(self, buildslave):
+    def remoteShutdown(self):
         raise NotImplementedError
 
     def remoteStartBuild(self, builderName):

master/buildbot/buildslave/protocols/pb.py

@@ -159,7 +159,7 @@ def doKeepalive(self):
         return self.mind.callRemote('print', message="keepalive")
 
     @defer.inlineCallbacks
-    def remoteShutdown(self, buildslave):
+    def remoteShutdown(self):
         # First, try the "new" way - calling our own remote's shutdown
         # method. The method was only added in 0.8.3, so ignore NoSuchMethod
         # failures.
@@ -184,13 +184,13 @@ def check_connlost(f):
         # remote builder, which will cause the slave buildbot process to exit.
         def old_way():
             d = None
-            for b in buildslave.slavebuilders.values():
+            for b in self.buildslave.slavebuilders.values():
                 if b.remote:
                     d = b.mind.callRemote("shutdown")
                     break
 
             if d:
-                log.msg("Shutting down (old) slave: %s" % buildslave.slavename)
+                log.msg("Shutting down (old) slave: %s" % self.buildslave.slavename)
                 # The remote shutdown call will not complete successfully since the
                 # buildbot process exits almost immediately after getting the
                 # shutdown request.
@@ -199,7 +199,7 @@ def old_way():
                 # shutdown as expected.
                 def _errback(why):
                     if why.check(pb.PBConnectionLost):
-                        log.msg("Lost connection to %s" % buildslave.slavename)
+                        log.msg("Lost connection to %s" % self.buildslave.slavename)
                     else:
                         log.err("Unexpected error when trying to shutdown %s" % buildslave.slavename)
                 d.addErrback(_errback)

master/buildbot/test/unit/test_buildslave_base.py

@@ -18,6 +18,7 @@
 from twisted.internet import defer, task, reactor
 from buildbot import config, locks
 from buildbot.buildslave import base
+from buildbot.buildslave.protocols import base as protocols_base
 from buildbot.test.fake import fakemaster, fakedb, bslavemanager
 from buildbot.test.fake.botmaster import FakeBotMaster
 
@@ -38,7 +39,8 @@ def createBuildslave(self, name='bot', password='pass', attached=False, **kwargs
         slave = self.ConcreteBuildSlave(name, password, **kwargs)
         slave.master = self.master
         slave.botmaster = self.botmaster
-        if attached: slave.conn = mock.Mock()
+        if attached:
+            slave.conn = mock.Mock(spec=protocols_base.Connection)
         return slave
 
     def test_constructor_minimal(self):
@@ -327,7 +329,7 @@ def test_slave_shutdown(self):
         yield slave.startService()
 
         yield slave.shutdown()
-        slave.conn.remoteShutdown.assert_called_with(slave)
+        slave.conn.remoteShutdown.assert_called_with()
 
     @defer.inlineCallbacks
     def test_slave_shutdown_not_connected(self):

master/buildbot/test/unit/test_buildslave_protocols_pb.py

@@ -165,10 +165,8 @@ def test_doKeepalive(self):
     def test_remoteShutdown(self):
         self.mind.callRemote.return_value = defer.succeed(None)
         conn = pb.Connection(self.master, self.buildslave, self.mind)
-        buildslave = None
-        # "buildslave" required to shutdown slave in "old way", since
-        # this feature deprecated and hard to test in reality it's not tested
-        conn.remoteShutdown(buildslave)
+        # note that we do not test the "old way", as it is now *very* old.
+        conn.remoteShutdown()
 
         self.mind.callRemote.assert_called_with('shutdown')
 

master/buildbot/test/util/protocols.py

@@ -54,7 +54,7 @@ def startCommands(self, remoteCommand, builderName, commandId,
 
     def test_sig_remoteShutdown(self):
         @self.assertArgSpecMatches(self.conn.remoteShutdown)
-        def remoteShutdown(self, buildslave):
+        def remoteShutdown(self):
             pass
 
     def test_sig_remoteStartBuild(self):

master/docs/developer/cls-protocols.rst

@@ -69,13 +69,11 @@ to know about protocol calls or handle protocol specific exceptions.
 
         Start command on slave
 
-    .. py:method:: remoteShutdown(buildslave)
+    .. py:method:: remoteShutdown()
 
-        :param buildslave: buildbot.buildslave.base.BuildSlave instance
         :returns: Deferred
 
-        Shutdown slave, "buildslave" required to shutdown old slaves (saved for
-        backward compatability) 
+        Shutdown the slave, causing its process to halt permanently.
 
     .. py:method:: remoteStartBuild(builderName)