Ticket #210: bb-bug210.patch

File bb-bug210.patch, 1.7 kB (added by gward, 10 months ago)

Patch with test case

  • a/buildbot/steps/transfer.py

    old new  
    8181 
    8282    def _getWorkdir(self): 
    8383        if self.workdir is None: 
    84             return self.DEFAULT_WORKDIR 
     84            workdir = self.DEFAULT_WORKDIR 
    8585        else: 
    86             return self.workdir 
     86            workdir = self.workdir 
     87        return render_properties(workdir, self.build) 
    8788 
    8889 
    8990class FileUpload(_TransferBuildStep): 

  • a/buildbot/test/test_transfer.py

    old new  
    33import os 
    44from stat import ST_MODE 
    55from twisted.trial import unittest 
     6from buildbot.process.buildstep import WithProperties 
    67from buildbot.steps.transfer import FileUpload, FileDownload 
    78from buildbot.test.runutils import StepTester 
    89from buildbot.status.builder import SUCCESS, FAILURE 
    …… 
    186187        d.addCallback(_checkUpload) 
    187188        return d 
    188189 
    189      
     190    def testWithProperties(self): 
     191        # test that workdir can be a WithProperties object 
     192        self.slavebase = "Upload.testWithProperties.slave" 
     193        self.masterbase = "Upload.testWithProperties.master" 
     194        sb = self.makeSlaveBuilder() 
     195 
     196        step = self.makeStep(FileUpload, 
     197                             slavesrc="src.txt", 
     198                             masterdest="dest.txt") 
     199        step.workdir = WithProperties("build.%s", "buildnumber") 
     200 
     201        self.failUnlessEqual(step._getWorkdir(), "build.1") 
     202 
    190203 
    191204class Download(StepTester, unittest.TestCase): 
    192205