Skip to content

Commit

Permalink
Fixed CVS, Git source step "copy" method tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpommerening committed Oct 19, 2013
1 parent a674fbb commit b5d941f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions master/buildbot/test/unit/test_steps_source_cvs.py
Expand Up @@ -389,7 +389,7 @@ def test_mode_full_copy(self):
ExpectShell(workdir='source',
command=['cvs', '-z3', 'update', '-dP'])
+ 0,
Expect('cpdir', {'fromdir': 'source', 'todir': 'build',
Expect('cpdir', {'fromdir': 'source', 'todir': 'wkdir',
'logEnviron': True})
+ 0,
)
Expand Down Expand Up @@ -428,7 +428,7 @@ def test_mode_full_copy_wrong_repo(self):
':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot',
'-z3', 'checkout', '-d', 'source', 'mozilla/browser/'])
+ 0,
Expect('cpdir', {'fromdir': 'source', 'todir': 'build',
Expect('cpdir', {'fromdir': 'source', 'todir': 'wkdir',
'logEnviron': True})
+ 0,
)
Expand Down
4 changes: 2 additions & 2 deletions master/buildbot/test/unit/test_steps_source_git.py
Expand Up @@ -1052,10 +1052,10 @@ def test_mode_full_copy(self):
ExpectShell(workdir='source',
command=['git', 'reset', '--hard', 'FETCH_HEAD', '--'])
+ 0,
Expect('cpdir', {'fromdir': 'source', 'todir': 'build',
Expect('cpdir', {'fromdir': 'source', 'todir': 'wkdir',
'logEnviron': True, 'timeout': 1200})
+ 0,
ExpectShell(workdir='build',
ExpectShell(workdir='wkdir',
command=['git', 'rev-parse', 'HEAD'])
+ ExpectShell.log('stdio',
stdout='f6ad368298bd941e934a41f3babc827b2aa95a1d')
Expand Down

0 comments on commit b5d941f

Please sign in to comment.