Only the last CI result can be treated as merged
CI may leave several comments for the same patch set. This can happen if tests are restarted by recheck command. For merged patchsets only the very last result can be treated as final. Change-Id: I5a0200089795cc132c083d9683ca4a4f70e37d5f
This commit is contained in:
@@ -44,6 +44,7 @@ def find_ci_result(review, ci_map):
|
||||
|
||||
review_id = review['id']
|
||||
review_number = review['number']
|
||||
ci_already_seen = set()
|
||||
|
||||
for comment in reversed(review.get('comments') or []):
|
||||
reviewer_id = comment['reviewer'].get('username')
|
||||
@@ -76,9 +77,13 @@ def find_ci_result(review, ci_map):
|
||||
result = _find_vote(review, ci['id'], patch_set_number)
|
||||
|
||||
if result is not None:
|
||||
is_merged = (review['status'] == 'MERGED' and
|
||||
patch_set_number == review['patchSets'][-1]
|
||||
['number'])
|
||||
is_merged = (
|
||||
review['status'] == 'MERGED' and
|
||||
patch_set_number == review['patchSets'][-1]['number'] and
|
||||
ci['id'] not in ci_already_seen)
|
||||
|
||||
ci_already_seen.add(ci['id'])
|
||||
|
||||
yield {
|
||||
'reviewer': comment['reviewer'],
|
||||
'ci_result': result,
|
||||
|
||||
Reference in New Issue
Block a user