def testPushChange(self): git_log = 'Marking test_one as stable\nMarking test_two as stable\n' fake_description = 'Marking set of ebuilds as stable\n\n%s' % git_log self.mox.StubOutWithMock(cros_mark_as_stable, '_DoWeHaveLocalCommits') self.mox.StubOutWithMock(cros_mark_as_stable.GitBranch, 'CreateBranch') self.mox.StubOutWithMock(cros_mark_as_stable.GitBranch, 'Exists') self.mox.StubOutWithMock(git, 'PushWithRetry') self.mox.StubOutWithMock(git, 'GetTrackingBranch') self.mox.StubOutWithMock(git, 'SyncPushBranch') self.mox.StubOutWithMock(git, 'CreatePushBranch') self.mox.StubOutWithMock(git, 'RunGit') cros_mark_as_stable._DoWeHaveLocalCommits( self._branch, self._target_manifest_branch, '.').AndReturn(True) git.GetTrackingBranch('.', for_push=True).AndReturn( ['gerrit', 'refs/remotes/gerrit/master']) git.SyncPushBranch('.', 'gerrit', 'refs/remotes/gerrit/master') cros_mark_as_stable._DoWeHaveLocalCommits( self._branch, 'refs/remotes/gerrit/master', '.').AndReturn(True) result = cros_build_lib.CommandResult(output=git_log) cros_build_lib.RunCommandCaptureOutput( ['git', 'log', '--format=format:%s%n%n%b', 'refs/remotes/gerrit/master..%s' % self._branch], cwd='.').AndReturn(result) git.CreatePushBranch('merge_branch', '.') git.RunGit('.', ['merge', '--squash', self._branch]) git.RunGit('.', ['commit', '-m', fake_description]) git.RunGit('.', ['config', 'push.default', 'tracking']) git.PushWithRetry('merge_branch', '.', dryrun=False) self.mox.ReplayAll() cros_mark_as_stable.PushChange(self._branch, self._target_manifest_branch, False, '.') self.mox.VerifyAll()
def testPushChange(self): git_log = 'Marking test_one as stable\nMarking test_two as stable\n' fake_description = 'Marking set of ebuilds as stable\n\n%s' % git_log self.mox.StubOutWithMock(cros_mark_as_stable, '_DoWeHaveLocalCommits') self.mox.StubOutWithMock(cros_mark_as_stable.GitBranch, 'CreateBranch') self.mox.StubOutWithMock(cros_mark_as_stable.GitBranch, 'Exists') self.mox.StubOutWithMock(git, 'PushWithRetry') self.mox.StubOutWithMock(git, 'GetTrackingBranch') self.mox.StubOutWithMock(git, 'SyncPushBranch') self.mox.StubOutWithMock(git, 'CreatePushBranch') self.mox.StubOutWithMock(git, 'RunGit') cros_mark_as_stable._DoWeHaveLocalCommits( self._branch, self._target_manifest_branch, '.').AndReturn(True) git.GetTrackingBranch('.', for_push=True).AndReturn( ['gerrit', 'refs/remotes/gerrit/master']) git.SyncPushBranch('.', 'gerrit', 'refs/remotes/gerrit/master') cros_mark_as_stable._DoWeHaveLocalCommits( self._branch, 'refs/remotes/gerrit/master', '.').AndReturn(True) result = cros_build_lib.CommandResult(output=git_log) cros_build_lib.RunCommandCaptureOutput( ['git', 'log', '--format=format:%s%n%n%b', 'refs/remotes/gerrit/master..%s' % self._branch], cwd='.').AndReturn(result) git.CreatePushBranch('merge_branch', '.') git.RunGit('.', ['merge', '--squash', self._branch]) git.RunGit('.', ['commit', '-m', fake_description]) git.RunGit('.', ['config', 'push.default', 'tracking']) git.PushWithRetry('merge_branch', '.', dryrun=False) self.mox.ReplayAll() cros_mark_as_stable.PushChange(self._branch, self._target_manifest_branch, False, '.') self.mox.VerifyAll()
def _TestPushChange(self, bad_cls): git_log = 'Marking test_one as stable\nMarking test_two as stable\n' fake_description = 'Marking set of ebuilds as stable\n\n%s' % git_log self.mox.StubOutWithMock(cros_mark_as_stable, '_DoWeHaveLocalCommits') self.mox.StubOutWithMock(cros_mark_as_stable.GitBranch, 'CreateBranch') self.mox.StubOutWithMock(cros_mark_as_stable.GitBranch, 'Exists') self.mox.StubOutWithMock(git, 'PushWithRetry') self.mox.StubOutWithMock(git, 'GetTrackingBranch') self.mox.StubOutWithMock(git, 'SyncPushBranch') self.mox.StubOutWithMock(git, 'CreatePushBranch') self.mox.StubOutWithMock(git, 'RunGit') # Run the flow. cros_mark_as_stable._DoWeHaveLocalCommits( self._branch, self._target_manifest_branch, '.').AndReturn(True) git.GetTrackingBranch('.', for_push=True).AndReturn( ['gerrit', 'refs/remotes/gerrit/master']) git.SyncPushBranch('.', 'gerrit', 'refs/remotes/gerrit/master') cros_mark_as_stable._DoWeHaveLocalCommits( self._branch, 'refs/remotes/gerrit/master', '.').AndReturn(True) # Look for bad CLs. cmd = ['log', '--format=short', '--perl-regexp', '--author', '^(?!chrome-bot)', 'refs/remotes/gerrit/master..%s' % self._branch] if bad_cls: result = cros_build_lib.CommandResult(output='Found bad stuff') git.RunGit('.', cmd).AndReturn(result) else: result = cros_build_lib.CommandResult(output='\n') git.RunGit('.', cmd).AndReturn(result) result = cros_build_lib.CommandResult(output=git_log) cmd = ['log', '--format=format:%s%n%n%b', 'refs/remotes/gerrit/master..%s' % self._branch] git.RunGit('.', cmd).AndReturn(result) git.CreatePushBranch('merge_branch', '.') git.RunGit('.', ['merge', '--squash', self._branch]) git.RunGit('.', ['commit', '-m', fake_description]) git.RunGit('.', ['config', 'push.default', 'tracking']) git.PushWithRetry('merge_branch', '.', dryrun=False) self.mox.ReplayAll() cros_mark_as_stable.PushChange(self._branch, self._target_manifest_branch, False, '.') self.mox.VerifyAll()