diff options
| author | David James <davidjames@google.com> | 2015-10-23 07:56:01 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-10-23 16:32:45 -0700 |
| commit | 479596311512415c700a2a46eb6a43b9362586df (patch) | |
| tree | dd9481594e4e1de6ce07a0e24c5b7ed4a4dd1050 | |
| parent | 23d9f8f73555ed588d1e0e2d4c81e09fff6b9644 (diff) | |
| download | chromite-479596311512415c700a2a46eb6a43b9362586df.tar.gz | |
Test that branch exists before pushing.
BUG=chromium:545779
TEST=pre-cq
Change-Id: I349167b31891cbf69853417d3afc82bf70daa7fa
Reviewed-on: https://chromium-review.googlesource.com/308420
Commit-Ready: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Reviewed-by: Jonathan Ross <jonross@google.com>
Reviewed-by: Paul Hobbs <phobbs@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
| -rw-r--r-- | scripts/cros_mark_as_stable.py | 6 | ||||
| -rw-r--r-- | scripts/cros_mark_as_stable_unittest.py | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/cros_mark_as_stable.py b/scripts/cros_mark_as_stable.py index a97c578f0..6039a575f 100644 --- a/scripts/cros_mark_as_stable.py +++ b/scripts/cros_mark_as_stable.py @@ -104,8 +104,12 @@ def PushChange(stable_branch, tracking_branch, dryrun, cwd): Raises: OSError: Error occurred while pushing. """ + if not git.DoesCommitExistInRepo(cwd, stable_branch): + logging.debug('No branch created for %s. Exiting', cwd) + return + if not _DoWeHaveLocalCommits(stable_branch, tracking_branch, cwd): - logging.info('No work found to push in %s. Exiting', cwd) + logging.debug('No work found to push in %s. Exiting', cwd) return # For the commit queue, our local branch may contain commits that were diff --git a/scripts/cros_mark_as_stable_unittest.py b/scripts/cros_mark_as_stable_unittest.py index 69ceec08a..35ea08094 100644 --- a/scripts/cros_mark_as_stable_unittest.py +++ b/scripts/cros_mark_as_stable_unittest.py @@ -41,6 +41,7 @@ class NonClassTests(cros_test_lib.MockTestCase): 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.PatchObject(git, 'DoesCommitExistInRepo', return_value=True) self.PatchObject(cros_mark_as_stable, '_DoWeHaveLocalCommits', return_value=True) self.PatchObject(cros_mark_as_stable.GitBranch, 'CreateBranch', |