Skip to content

Commit ee06900

Browse files
authored
Merge pull request #3608 from migueldiascosta/filter_duplicates_in_changes_requested_by
filter duplicates in changes_requested_by
2 parents 963d6f1 + 8cb4f40 commit ee06900

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

easybuild/tools/github.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,7 @@ def not_eligible(msg):
11461146
changes_requested_by = []
11471147
for review in pr_data['reviews']:
11481148
if review['state'] == 'CHANGES_REQUESTED':
1149-
if review['user']['login'] not in approved_review_by:
1149+
if review['user']['login'] not in approved_review_by + changes_requested_by:
11501150
changes_requested_by.append(review['user']['login'])
11511151

11521152
msg_tmpl = "* no pending change requests: %s"

test/framework/github.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,9 @@ def run_check(expected_result=False):
657657
'number': '1234',
658658
'merged': False,
659659
'mergeable_state': 'unknown',
660-
'reviews': [{'state': 'CHANGES_REQUESTED', 'user': {'login': 'boegel'}}],
660+
'reviews': [{'state': 'CHANGES_REQUESTED', 'user': {'login': 'boegel'}},
661+
# to check that duplicates are filtered
662+
{'state': 'CHANGES_REQUESTED', 'user': {'login': 'boegel'}}],
661663
}
662664

663665
test_result_warning_template = "* test suite passes: %s => not eligible for merging!"

0 commit comments

Comments
 (0)