zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto roller: Fix GenerateCommitMessage signature.

Browse Source 
TODO: Add integration test.

Bug: chromium:855108
Change-Id: Ic892cd09e6712e9b7304e8b10b5fdc147b38a6bd
Reviewed-on: https://webrtc-review.googlesource.com/101040
Commit-Queue: Yves Gerey <yvesg@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24776}
This commit is contained in:
Yves Gerey
2018-09-19 17:25:20 +02:00
committed by Commit Bot
parent 26a6b5899f
commit 31eb01faa5
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools_webrtc/autoroller/roll_deps.py
View File

@ -419,9 +419,11 @@ def CalculateChangedClang(new_cr_rev):
def GenerateCommitMessage(rev_update, current_commit_pos, new_commit_pos, def GenerateCommitMessage(rev_update, current_commit_pos, new_commit_pos,
changed_deps_list, clang_change=None, changed_deps_list,
added_deps_paths=None, added_deps_paths=None,
removed_deps_paths=None): removed_deps_paths=None,
clang_change=None,
):
current_cr_rev = rev_update.current_chromium_rev[0:10] current_cr_rev = rev_update.current_chromium_rev[0:10]
new_cr_rev = rev_update.new_chromium_rev[0:10] new_cr_rev = rev_update.new_chromium_rev[0:10]
rev_interval = '%s..%s' % (current_cr_rev, new_cr_rev) rev_interval = '%s..%s' % (current_cr_rev, new_cr_rev)
@ -683,12 +685,11 @@ def main():
raise RollError('WebRTC DEPS entries are missing from Chromium: %s. ' raise RollError('WebRTC DEPS entries are missing from Chromium: %s. '
'Remove them or add them to DONT_AUTOROLL_THESE.' % other_deps) 'Remove them or add them to DONT_AUTOROLL_THESE.' % other_deps)
clang_change = CalculateChangedClang(rev_update.new_chromium_rev) clang_change = CalculateChangedClang(rev_update.new_chromium_rev)
commit_msg = GenerateCommitMessage(rev_update, commit_msg = GenerateCommitMessage(
current_commit_pos, new_commit_pos, rev_update, current_commit_pos, new_commit_pos, changed_deps,
changed_deps, added_deps_paths=new_generated_android_deps,
new_generated_android_deps, removed_deps_paths=removed_generated_android_deps,
removed_generated_android_deps, clang_change=clang_change)
clang_change)
logging.debug('Commit message:\n%s', commit_msg) logging.debug('Commit message:\n%s', commit_msg)
_CreateRollBranch(opts.dry_run) _CreateRollBranch(opts.dry_run)

3
tools_webrtc/autoroller/unittests/roll_deps_test.py
View File

@ -287,8 +287,7 @@ class TestRollChromiumRevision(unittest.TestCase):
new_commit_pos = 'f00d' new_commit_pos = 'f00d'
commit_msg = GenerateCommitMessage(NO_CHROMIUM_REVISION_UPDATE, commit_msg = GenerateCommitMessage(NO_CHROMIUM_REVISION_UPDATE,
current_commit_pos, new_commit_pos, current_commit_pos, new_commit_pos,
changed_deps, None, changed_deps, added_paths, removed_paths)
added_paths, removed_paths)
return [l.strip() for l in commit_msg.split('\n')] return [l.strip() for l in commit_msg.split('\n')]