Merge pull request #2239 from rutsky/upload_rename_slavesrc

rename "slavesrc" to "workersrc" in buildbot-worker's uploadFile and uploadDirectory commands
buildbot · Jun 15, 2016 · 6d1d46f · 6d1d46f
2 parents 32d7385 + db79844
commit 6d1d46f
Show file tree

Hide file tree

Showing 9 changed files with 331 additions and 91 deletions.
diff --git a/master/buildbot/steps/source/cvs.py b/master/buildbot/steps/source/cvs.py
@@ -302,8 +302,16 @@ def _sourcedirIsUpdatable(self):
             'blocksize': 32 * 1024,
         }
 
+        def uploadFileArgs(source):
+            full_args = dict(args)
+            if self.workerVersionIsOlderThan('uploadFile', '3.0'):
+                full_args['slavesrc'] = source
+            else:
+                full_args['workersrc'] = source
+            return full_args
+
         cmd = remotecommand.RemoteCommand('uploadFile',
-                                          dict(slavesrc='Root', **args),
+                                          uploadFileArgs('Root'),
                                           ignore_updates=True)
         yield self.runCommand(cmd)
         if cmd.rc is not None and cmd.rc != 0:
@@ -321,7 +329,7 @@ def _sourcedirIsUpdatable(self):
 
         myFileWriter.buffer = ""
         cmd = remotecommand.RemoteCommand('uploadFile',
-                                          dict(slavesrc='Repository', **args),
+                                          uploadFileArgs('Repository'),
                                           ignore_updates=True)
         yield self.runCommand(cmd)
         if cmd.rc is not None and cmd.rc != 0:
@@ -335,7 +343,7 @@ def _sourcedirIsUpdatable(self):
         # we can't update (unless we remove those tags with cvs update -A)
         myFileWriter.buffer = ""
         cmd = buildstep.RemoteCommand('uploadFile',
-                                      dict(slavesrc='Entries', **args),
+                                      uploadFileArgs('Entries'),
                                       ignore_updates=True)
         yield self.runCommand(cmd)
         if cmd.rc is not None and cmd.rc != 0:

diff --git a/master/buildbot/steps/transfer.py b/master/buildbot/steps/transfer.py
@@ -149,14 +149,18 @@ def start(self):
 
         # default arguments
         args = {
-            'slavesrc': source,
             'workdir': self.workdir,
             'writer': fileWriter,
             'maxsize': self.maxsize,
             'blocksize': self.blocksize,
             'keepstamp': self.keepstamp,
         }
 
+        if self.workerVersionIsOlderThan('uploadFile', '3.0'):
+            args['slavesrc'] = source
+        else:
+            args['workersrc'] = source
+
         cmd = makeStatusRemoteCommand(self, 'uploadFile', args)
         d = self.runTransferCommand(cmd, fileWriter)
         d.addCallback(self.finished).addErrback(self.failed)
@@ -223,14 +227,18 @@ def start(self):
 
         # default arguments
         args = {
-            'slavesrc': source,
             'workdir': self.workdir,
             'writer': dirWriter,
             'maxsize': self.maxsize,
             'blocksize': self.blocksize,
             'compress': self.compress
         }
 
+        if self.workerVersionIsOlderThan('uploadDirectory', '3.0'):
+            args['slavesrc'] = source
+        else:
+            args['workersrc'] = source
+
         cmd = makeStatusRemoteCommand(self, 'uploadDirectory', args)
         d = self.runTransferCommand(cmd, dirWriter)
         d.addCallback(self.finished).addErrback(self.failed)
@@ -282,14 +290,18 @@ def uploadFile(self, source, masterdest):
             masterdest, self.maxsize, self.mode)
 
         args = {
-            'slavesrc': source,
             'workdir': self.workdir,
             'writer': fileWriter,
             'maxsize': self.maxsize,
             'blocksize': self.blocksize,
             'keepstamp': self.keepstamp,
         }
 
+        if self.workerVersionIsOlderThan('uploadFile', '3.0'):
+            args['slavesrc'] = source
+        else:
+            args['workersrc'] = source
+
         cmd = makeStatusRemoteCommand(self, 'uploadFile', args)
         return self.runTransferCommand(cmd, fileWriter)
 
@@ -298,14 +310,18 @@ def uploadDirectory(self, source, masterdest):
             masterdest, self.maxsize, self.compress, 0o600)
 
         args = {
-            'slavesrc': source,
             'workdir': self.workdir,
             'writer': dirWriter,
             'maxsize': self.maxsize,
             'blocksize': self.blocksize,
             'compress': self.compress
         }
 
+        if self.workerVersionIsOlderThan('uploadDirectory', '3.0'):
+            args['slavesrc'] = source
+        else:
+            args['workersrc'] = source
+
         cmd = makeStatusRemoteCommand(self, 'uploadDirectory', args)
         return self.runTransferCommand(cmd, dirWriter)
 

diff --git a/master/buildbot/steps/worker.py b/master/buildbot/steps/worker.py
@@ -293,13 +293,17 @@ def getFileContentFromWorker(self, filename, abandonOnFailure=False):
         fileWriter = remotetransfer.StringFileWriter()
         # default arguments
         args = {
-            'slavesrc': filename,
             'workdir': self.workdir,
             'writer': fileWriter,
             'maxsize': None,
             'blocksize': 32 * 1024,
         }
 
+        if self.workerVersionIsOlderThan('uploadFile', '3.0'):
+            args['slavesrc'] = filename
+        else:
+            args['workersrc'] = filename
+
         def commandComplete(cmd):
             if cmd.didFail():
                 return None

diff --git a/master/buildbot/test/unit/test_steps_shell.py b/master/buildbot/test/unit/test_steps_shell.py
@@ -754,7 +754,7 @@ def upload_behavior(command):
         self.expectCommands(
             # step will first get the remote suppressions file
             Expect('uploadFile', dict(blocksize=32768, maxsize=None,
-                                      slavesrc='supps', workdir='wkdir',
+                                      workersrc='supps', workdir='wkdir',
                                       writer=ExpectRemoteRef(remotetransfer.StringFileWriter)))
             + Expect.behavior(upload_behavior),