Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rename "slavedest" to "workerdest" in buildbot-worker's downloadFile command #2244

Merged
merged 4 commits into from
Jun 23, 2016
Merged

rename "slavedest" to "workerdest" in buildbot-worker's downloadFile command #2244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
460eb03
rename "slavedest" to "workerdest" in buildbot-worker's downloadFile …
rutsky May 30, 2016
b01f040
move check for worker 2.16 to clobber test
rutsky Jun 5, 2016
a8a28ab
add unit test for FileDownload
rutsky Jun 5, 2016
93ef3f1
add unit test for FileDownload with worker version 2.16
rutsky Jun 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion master/buildbot/steps/source/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,18 @@ def patch(self, _, patch):
def _downloadFile(buf, filename):
filereader = remotetransfer.StringFileReader(buf)
args = {
'slavedest': filename,
'maxsize': None,
'reader': filereader,
'blocksize': 16 * 1024,
'workdir': self.workdir,
'mode': None
}

if self.workerVersionIsOlderThan('downloadFile', '3.0'):
args['slavedest'] = filename
else:
args['workerdest'] = filename

cmd = remotecommand.RemoteCommand('downloadFile', args)
cmd.useLog(self.stdio_log, False)
log.msg("Downloading file: %s" % (filename))
Expand Down
7 changes: 6 additions & 1 deletion master/buildbot/steps/source/darcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,18 @@ def _sourcedirIsUpdatable(self):
def _downloadFile(self, buf, filename):
filereader = remotetransfer.StringFileReader(buf)
args = {
'slavedest': filename,
'maxsize': None,
'reader': filereader,
'blocksize': 16 * 1024,
'workdir': self.workdir,
'mode': None
}

if self.workerVersionIsOlderThan('downloadFile', '3.0'):
args['slavedest'] = filename
else:
args['workerdest'] = filename

cmd = remotecommand.RemoteCommand('downloadFile', args)
cmd.useLog(self.stdio_log, False)
log.msg("Downloading file: %s" % (filename))
Expand Down
12 changes: 10 additions & 2 deletions master/buildbot/steps/transfer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,14 +471,18 @@ def start(self):

# default arguments
args = {
'slavedest': workerdest,
'maxsize': self.maxsize,
'reader': fileReader,
'blocksize': self.blocksize,
'workdir': self.workdir,
'mode': self.mode,
}

if self.workerVersionIsOlderThan('downloadFile', '3.0'):
args['slavedest'] = workerdest
else:
args['workerdest'] = workerdest

cmd = makeStatusRemoteCommand(self, 'downloadFile', args)
d = self.runTransferCommand(cmd)
d.addCallback(self.finished).addErrback(self.failed)
Expand Down Expand Up @@ -537,14 +541,18 @@ def start(self):

# default arguments
args = {
'slavedest': workerdest,
'maxsize': self.maxsize,
'reader': fileReader,
'blocksize': self.blocksize,
'workdir': self.workdir,
'mode': self.mode,
}

if self.workerVersionIsOlderThan('downloadFile', '3.0'):
args['slavedest'] = workerdest
else:
args['workerdest'] = workerdest

cmd = makeStatusRemoteCommand(self, 'downloadFile', args)
d = self.runTransferCommand(cmd)
d.addCallback(self.finished).addErrback(self.failed)
Expand Down
50 changes: 50 additions & 0 deletions master/buildbot/test/unit/test_steps_source_bzr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,56 @@ def test_mode_full_clean_patch(self):
self.setupStep(
bzr.Bzr(repourl='http://bzr.squid-cache.org/bzr/squid3/trunk',
mode='full', method='clean'), patch=(1, 'patch'))
self.expectCommands(
ExpectShell(workdir='wkdir',
command=['bzr', '--version'])
+ 0,
Expect('stat', dict(file='wkdir/.buildbot-patched',
logEnviron=True))
+ 1,
Expect('stat', dict(file='wkdir/.bzr',
logEnviron=True))
+ 0,
ExpectShell(workdir='wkdir',
command=['bzr', 'clean-tree', '--ignored', '--force'])
+ 0,
ExpectShell(workdir='wkdir',
command=['bzr', 'update'])
+ 0,
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.FileReader),
workerdest='.buildbot-diff', workdir='wkdir',
mode=None))
+ 0,
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.FileReader),
workerdest='.buildbot-patched', workdir='wkdir',
mode=None))
+ 0,
ExpectShell(workdir='wkdir',
command=['patch', '-p1', '--remove-empty-files',
'--force', '--forward', '-i', '.buildbot-diff'])
+ 0,
Expect('rmdir', dict(dir='wkdir/.buildbot-diff',
logEnviron=True))
+ 0,
ExpectShell(workdir='wkdir',
command=['bzr', 'version-info', '--custom', "--template='{revno}"])
+ ExpectShell.log('stdio',
stdout='100')
+ 0,
)
self.expectOutcome(result=SUCCESS)
self.expectProperty('got_revision', '100', 'Bzr')
return self.runStep()

def test_mode_full_clean_patch_worker_2_16(self):
self.setupStep(
bzr.Bzr(repourl='http://bzr.squid-cache.org/bzr/squid3/trunk',
mode='full', method='clean'), patch=(1, 'patch'),
worker_version={'*': '2.16'})
self.expectCommands(
ExpectShell(workdir='wkdir',
command=['bzr', '--version'])
Expand Down
64 changes: 64 additions & 0 deletions master/buildbot/test/unit/test_steps_source_cvs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,70 @@ def test_mode_full_clean_patch(self):
ExpectShell(workdir='wkdir',
command=['cvs', '-z3', 'update', '-dP'])
+ 0,
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.StringFileReader),
workerdest='.buildbot-diff', workdir='wkdir',
mode=None))
+ 0,
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.StringFileReader),
workerdest='.buildbot-patched', workdir='wkdir',
mode=None))
+ 0,
ExpectShell(workdir='wkdir',
command=['patch', '-p1', '--remove-empty-files',
'--force', '--forward', '-i', '.buildbot-diff'])
+ 0,
Expect('rmdir', dict(dir='wkdir/.buildbot-diff',
logEnviron=True))
+ 0,
)
self.expectOutcome(result=SUCCESS)
self.expectProperty('got_revision', '2012-09-09 12:00:39 +0000', 'CVS')
return self.runStep()

def test_mode_full_clean_patch_worker_2_16(self):
self.setupStep(
cvs.CVS(cvsroot=":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot",
cvsmodule="mozilla/browser/", mode='full', method='clean'),
patch=(1, 'patch'),
worker_version={'*': '2.16'})
self.expectCommands(
ExpectShell(workdir='wkdir',
command=['cvs', '--version'])
+ 0,
Expect('stat', dict(file='wkdir/.buildbot-patched',
logEnviron=True))
+ 0,
ExpectShell(workdir='wkdir',
command=['cvsdiscard'])
+ 0,
Expect('uploadFile', dict(blocksize=32768, maxsize=None,
slavesrc='Root', workdir='wkdir/CVS',
writer=ExpectRemoteRef(remotetransfer.StringFileWriter)))
+
Expect.behavior(
uploadString(':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'))
+ 0,
Expect('uploadFile', dict(blocksize=32768, maxsize=None,
slavesrc='Repository', workdir='wkdir/CVS',
writer=ExpectRemoteRef(remotetransfer.StringFileWriter)))
+ Expect.behavior(uploadString('mozilla/browser/'))
+ 0,
Expect('uploadFile', dict(blocksize=32768, maxsize=None,
slavesrc='Entries', workdir='wkdir/CVS',
writer=ExpectRemoteRef(remotetransfer.StringFileWriter)))
+
Expect.behavior(uploadString('/file/1.1/Fri May 17 23:20:00//\nD'))
+ 0,
ExpectShell(workdir='wkdir',
command=['cvsdiscard'])
+ 0,
ExpectShell(workdir='wkdir',
command=['cvs', '-z3', 'update', '-dP'])
+ 0,
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.StringFileReader),
Expand Down
42 changes: 40 additions & 2 deletions master/buildbot/test/unit/test_steps_source_darcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,13 @@ def test_mode_incremental_patch(self):
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.StringFileReader),
slavedest='.buildbot-diff', workdir='wkdir',
workerdest='.buildbot-diff', workdir='wkdir',
mode=None))
+ 0,
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.StringFileReader),
slavedest='.buildbot-patched', workdir='wkdir',
workerdest='.buildbot-patched', workdir='wkdir',
mode=None))
+ 0,
ExpectShell(workdir='wkdir',
Expand Down Expand Up @@ -316,6 +316,44 @@ def test_mode_full_clobber_revision(self):
darcs.Darcs(repourl='http://localhost/darcs',
mode='full', method='clobber'),
dict(revision='abcdef01'))
self.expectCommands(
ExpectShell(workdir='wkdir',
command=['darcs', '--version'])
+ 0,
Expect('stat', dict(file='wkdir/.buildbot-patched',
logEnviron=True))
+ 1,
Expect('rmdir', dict(dir='wkdir',
logEnviron=True))
+ 0,
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.StringFileReader),
workerdest='.darcs-context', workdir='wkdir',
mode=None))
+ 0,
ExpectShell(workdir='.',
command=['darcs', 'get', '--verbose', '--lazy',
'--repo-name', 'wkdir', '--context',
'.darcs-context', 'http://localhost/darcs'])
+ 0,
ExpectShell(workdir='wkdir',
command=['darcs', 'changes', '--max-count=1'])
+ ExpectShell.log('stdio',
stdout='Tue Aug 20 09:18:41 IST 2013 abc@gmail.com')
+ 0,
)
self.expectOutcome(result=SUCCESS)
self.expectProperty(
'got_revision', 'Tue Aug 20 09:18:41 IST 2013 abc@gmail.com', 'Darcs')
return self.runStep()

def test_mode_full_clobber_revision_worker_2_16(self):
self.setupStep(
darcs.Darcs(repourl='http://localhost/darcs',
mode='full', method='clobber'),
dict(revision='abcdef01'),
worker_version={'*': '2.16'})
self.expectCommands(
ExpectShell(workdir='wkdir',
command=['darcs', '--version'])
Expand Down
71 changes: 69 additions & 2 deletions master/buildbot/test/unit/test_steps_source_git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,73 @@ def test_mode_full_clean_patch(self):
git.Git(repourl='http://github.com/buildbot/buildbot.git',
mode='full', method='clean'),
patch=(1, 'patch'))
self.expectCommands(
ExpectShell(workdir='wkdir',
command=['git', '--version'])
+ ExpectShell.log('stdio',
stdout='git version 1.7.5')
+ 0,
Expect('stat', dict(file='wkdir/.buildbot-patched',
logEnviron=True))
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'clean', '-f', '-f', '-d', '-x'],
logEnviron=True)
+ 0,
Expect('listdir', {'dir': 'wkdir', 'logEnviron': True,
'timeout': 1200})
+ Expect.update('files', ['.git'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'clean', '-f', '-f', '-d'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'fetch', '-t',
'http://github.com/buildbot/buildbot.git',
'HEAD'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'reset', '--hard', 'FETCH_HEAD', '--'])
+ 0,
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.StringFileReader),
workerdest='.buildbot-diff', workdir='wkdir',
mode=None))
+ 0,
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.StringFileReader),
workerdest='.buildbot-patched', workdir='wkdir',
mode=None))
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'update-index', '--refresh'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'apply', '--index', '-p', '1'],
initialStdin='patch')
+ 0,
Expect('rmdir', dict(dir='wkdir/.buildbot-diff',
logEnviron=True))
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'rev-parse', 'HEAD'])
+ ExpectShell.log('stdio',
stdout='f6ad368298bd941e934a41f3babc827b2aa95a1d')
+ 0,
)
self.expectOutcome(result=SUCCESS)
self.expectProperty(
'got_revision', 'f6ad368298bd941e934a41f3babc827b2aa95a1d', 'Git')
return self.runStep()

def test_mode_full_clean_patch_worker_2_16(self):
self.setupStep(
git.Git(repourl='http://github.com/buildbot/buildbot.git',
mode='full', method='clean'),
patch=(1, 'patch'),
worker_version={'*': '2.16'})
self.expectCommands(
ExpectShell(workdir='wkdir',
command=['git', '--version'])
Expand Down Expand Up @@ -258,13 +325,13 @@ def test_mode_full_clean_patch_fail(self):
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.StringFileReader),
slavedest='.buildbot-diff', workdir='wkdir',
workerdest='.buildbot-diff', workdir='wkdir',
mode=None))
+ 0,
Expect('downloadFile', dict(blocksize=16384, maxsize=None,
reader=ExpectRemoteRef(
remotetransfer.StringFileReader),
slavedest='.buildbot-patched', workdir='wkdir',
workerdest='.buildbot-patched', workdir='wkdir',
mode=None))
+ 0,
ExpectShell(workdir='wkdir',
Expand Down