git-cl upload: adjust code-review score on TBR.
Since git-cl TBR always sets +1, it does not allow auto-submit where
using +2 score as approval. Let me make git-cl automatically adjust
to proper score.
Bug: 762425
Change-Id: I71fe1af1b8bf5e68d2509c60e8bf05024b6bdbb7
Reviewed-on: https://chromium-review.googlesource.com/680717
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 15e5cff..4eefdaa 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -1617,9 +1617,24 @@
]
if tbr:
calls += [
+ (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
+ ['LABELS']), {
+ 'labels': {
+ 'Code-Review': {
+ 'default_value': 0,
+ 'all': [],
+ 'values': {
+ '+2': 'lgtm, approved',
+ '+1': 'lgtm, but someone else must approve',
+ ' 0': 'No score',
+ '-1': 'Don\'t submit as-is',
+ }
+ }
+ }
+ }),
(('SetReview', 'chromium-review.googlesource.com',
123456 if squash else None, 'Self-approving for TBR',
- {'Code-Review': 1}, None), ''),
+ {'Code-Review': 2}, None), ''),
]
calls += cls._git_post_upload_calls()
return calls
@@ -1743,10 +1758,9 @@
[],
'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
'CC=more@example.com,people@example.com\n\n'
- 'Change-Id: 123456789\n',
+ 'Change-Id: 123456789',
['reviewer@example.com', 'another@example.com'],
- squash=False,
- squash_mode='override_nosquash',
+ expected_upstream_ref='origin/master',
cc=['more@example.com', 'people@example.com'],
tbr='reviewer@example.com')