mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-23 22:51:03 +02:00
Fix failing unit test for cros_mark_as_stable.
Change-Id: I683cdbec489395bbce53ae4d4ba45ec3538c2aac BUG=chromium-os:8693 TEST=Run unit tests. Review URL: http://codereview.chromium.org/6089002
This commit is contained in:
parent
702f0e31ca
commit
892e6d8f3c
@ -33,7 +33,7 @@ class NonClassTests(mox.MoxTestBase):
|
|||||||
cros_mark_as_stable.GitBranch.Exists().AndReturn(True)
|
cros_mark_as_stable.GitBranch.Exists().AndReturn(True)
|
||||||
cros_mark_as_stable._SimpleRunCommand('git log --format=format:%s%n%n%b ' +
|
cros_mark_as_stable._SimpleRunCommand('git log --format=format:%s%n%n%b ' +
|
||||||
self._tracking_branch + '..').AndReturn(git_log)
|
self._tracking_branch + '..').AndReturn(git_log)
|
||||||
cros_mark_as_stable._SimpleRunCommand('git remote update')
|
cros_mark_as_stable._SimpleRunCommand('repo sync .')
|
||||||
cros_mark_as_stable._SimpleRunCommand('git merge --squash %s' %
|
cros_mark_as_stable._SimpleRunCommand('git merge --squash %s' %
|
||||||
self._branch)
|
self._branch)
|
||||||
cros_mark_as_stable._SimpleRunCommand('git commit -m "%s"' %
|
cros_mark_as_stable._SimpleRunCommand('git commit -m "%s"' %
|
||||||
|
Loading…
x
Reference in New Issue
Block a user