transfer: accept string in workersrcs argument in MultipleFileUpload

buildbot · Feb 7, 2017 · 4173dac · 4173dac
1 parent a9e3f88
commit 4173dac
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/master/buildbot/steps/transfer.py b/master/buildbot/steps/transfer.py
@@ -277,7 +277,7 @@ def __init__(self, workersrcs=None, masterdest=None,
 
         _TransferBuildStep.__init__(self, workdir=workdir, **buildstep_kwargs)
 
-        self.workersrcs = workersrcs
+        self.workersrcs = workersrcs if isinstance(workersrcs, list) else [workersrcs]
         self._registerOldWorkerAttr("workersrcs")
         self.masterdest = masterdest
         self.maxsize = maxsize

diff --git a/master/buildbot/test/unit/test_steps_transfer.py b/master/buildbot/test/unit/test_steps_transfer.py
@@ -520,6 +520,25 @@ def testMultiple(self):
         d = self.runStep()
         return d
 
+    def testMultipleString(self):
+        self.setupStep(
+            transfer.MultipleFileUpload(workersrcs="srcfile", masterdest=self.destdir))
+        self.expectCommands(
+            Expect('stat', dict(file="srcfile",
+                                workdir='wkdir'))
+            + Expect.update('stat', [stat.S_IFREG, 99, 99])
+            + 0,
+            Expect('uploadFile', dict(
+                workersrc="srcfile", workdir='wkdir',
+                blocksize=16384, maxsize=None, keepstamp=False,
+                writer=ExpectRemoteRef(remotetransfer.FileWriter)))
+            + Expect.behavior(uploadString("Hello world!"))
+            + 0)
+        self.expectOutcome(
+            result=SUCCESS, state_string="uploading 1 file")
+        d = self.runStep()
+        return d
+
     def testGlob(self):
         self.setupStep(
             transfer.MultipleFileUpload(