Title: [292807] trunk/Tools
- Revision
- 292807
- Author
- [email protected]
- Date
- 2022-04-13 05:53:15 -0700 (Wed, 13 Apr 2022)
Log Message
[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
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (292806 => 292807)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-04-13 12:20:25 UTC (rev 292806)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-04-13 12:53:15 UTC (rev 292807)
@@ -1578,6 +1578,7 @@
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.
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (292806 => 292807)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-04-13 12:20:25 UTC (rev 292806)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-04-13 12:53:15 UTC (rev 292807)
@@ -5204,7 +5204,9 @@
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,8 +5216,22 @@
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())
self.setProperty('patch_id', '1234')
Modified: trunk/Tools/ChangeLog (292806 => 292807)
--- trunk/Tools/ChangeLog 2022-04-13 12:20:25 UTC (rev 292806)
+++ trunk/Tools/ChangeLog 2022-04-13 12:53:15 UTC (rev 292807)
@@ -1,3 +1,15 @@
+2022-04-12 Jonathan Bedard <[email protected]>
+
+ [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 <[email protected]>
[JHBuild] Unreviewed, replace 'false' for 'disabled' in glib mesonargs
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
