Skip to content
Permalink
Browse files
[Merge-Queue] Do not duplicate reviewer names
https://bugs.webkit.org/show_bug.cgi?id=239270
<rdar://problem/91662347>

Reviewed by Yusuke Suzuki.

* Tools/CISupport/ews-build/steps.py:
(ValidateCommitterAndReviewer.start):
* Tools/CISupport/ews-build/steps_unittest.py:

Canonical link: https://commits.webkit.org/249589@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292807 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
JonWBedard committed Apr 13, 2022
1 parent e66b393 commit 8b8003d4cc12efe56e372e9113d6987d94e8b949
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 2 deletions.
@@ -1578,6 +1578,7 @@ def start(self):
else:
reviewer = self.getProperty('reviewer', '').lower()
reviewers = [reviewer] if reviewer else []
reviewers = set(reviewers)

if not reviewers:
# Change has not been reviewed in bug tracker. This is acceptable, since the ChangeLog might have 'Reviewed by' in it.
@@ -5204,7 +5204,9 @@ def test_success_patch(self):
self.expectHidden(False)
self.assertEqual(ValidateCommitterAndReviewer.haltOnFailure, False)
self.expectOutcome(result=SUCCESS, state_string='Validated commiter and reviewer')
return self.runStep()
rc = self.runStep()
self.assertEqual(self.getProperty('reviewers_full_names'), ['WebKit Reviewer'])
return rc

def test_success_pr(self):
self.setupStep(ValidateCommitterAndReviewer())
@@ -5214,7 +5216,21 @@ def test_success_pr(self):
self.expectHidden(False)
self.assertEqual(ValidateCommitterAndReviewer.haltOnFailure, False)
self.expectOutcome(result=SUCCESS, state_string='Validated commiter and reviewer')
return self.runStep()
rc = self.runStep()
self.assertEqual(self.getProperty('reviewers_full_names'), ['WebKit Reviewer'])
return rc

def test_success_pr_duplicate(self):
self.setupStep(ValidateCommitterAndReviewer())
ValidateCommitterAndReviewer.get_reviewers = lambda x, pull_request, repository_url=None: ['webkit-reviewer', 'webkit-reviewer']
self.setProperty('github.number', '1234')
self.setProperty('owners', ['webkit-commit-queue'])
self.expectHidden(False)
self.assertEqual(ValidateCommitterAndReviewer.haltOnFailure, False)
self.expectOutcome(result=SUCCESS, state_string='Validated commiter and reviewer')
rc = self.runStep()
self.assertEqual(self.getProperty('reviewers_full_names'), ['WebKit Reviewer'])
return rc

def test_success_no_reviewer_patch(self):
self.setupStep(ValidateCommitterAndReviewer())
@@ -1,3 +1,15 @@
2022-04-12 Jonathan Bedard <jbedard@apple.com>

[Merge-Queue] Do not duplicate reviewer names
https://bugs.webkit.org/show_bug.cgi?id=239270
<rdar://problem/91662347>

Reviewed by Yusuke Suzuki.

* CISupport/ews-build/steps.py:
(ValidateCommitterAndReviewer.start):
* CISupport/ews-build/steps_unittest.py:

2022-04-13 Diego Pino Garcia <dpino@igalia.com>

[JHBuild] Unreviewed, replace 'false' for 'disabled' in glib mesonargs

0 comments on commit 8b8003d

Please sign in to comment.