Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ignore undismissed 'changes requested' review if there is an 'approved' review by the same user #3607

Merged
merged 1 commit into from
Mar 12, 2021
Merged

ignore undismissed 'changes requested' review if there is an 'approved' review by the same user #3607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions easybuild/tools/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,14 +1136,18 @@ def not_eligible(msg):
if not test_report_found:
res = not_eligible(msg_tmpl % "(no test reports found)")

# check for requested changes and approved review
# check for approved review
approved_review_by = []
changes_requested_by = []
for review in pr_data['reviews']:
if review['state'] == 'APPROVED':
approved_review_by.append(review['user']['login'])

# check for requested changes
changes_requested_by = []
for review in pr_data['reviews']:
if review['state'] == 'CHANGES_REQUESTED':
changes_requested_by.append(review['user']['login'])
if review['user']['login'] not in approved_review_by:
changes_requested_by.append(review['user']['login'])

msg_tmpl = "* no pending change requests: %s"
if changes_requested_by:
Expand Down
14 changes: 11 additions & 3 deletions test/framework/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,9 +721,17 @@ def run_check(expected_result=False):
expected_warning += " => not eligible for merging!"
run_check()

pr_data['reviews'] = [{'state': 'APPROVED', 'user': {'login': 'boegel'}}]
expected_stdout += "* no pending change requests: OK\n"
expected_stdout += "* approved review: OK (by boegel)\n"
# if PR is approved by a different user that requested changes and that request has not been dismissed,
# the PR is still not mergeable
pr_data['reviews'].append({'state': 'APPROVED', 'user': {'login': 'not_boegel'}})
expected_stdout_saved = expected_stdout
expected_stdout += "* approved review: OK (by not_boegel)\n"
run_check()

# if the user that requested changes approves the PR, it's mergeable
pr_data['reviews'].append({'state': 'APPROVED', 'user': {'login': 'boegel'}})
expected_stdout = expected_stdout_saved + "* no pending change requests: OK\n"
expected_stdout += "* approved review: OK (by not_boegel, boegel)\n"
expected_warning = ''
run_check()

Expand Down