Modified: trunk/Tools/CISupport/ews-build/steps.py (291353 => 291354)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-03-16 15:25:06 UTC (rev 291353)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-03-16 16:56:52 UTC (rev 291354)
@@ -666,9 +666,9 @@
shell.ShellCommand.start(self)
return None
- patch_reviewer_name = self.getProperty('patch_reviewer_full_name', '')
- if patch_reviewer_name:
- self.command.extend(['--reviewer', patch_reviewer_name])
+ reviewer_name = self.getProperty('reviewer_full_name', '')
+ if reviewer_name:
+ self.command.extend(['--reviewer', reviewer_name])
d = self.downloadFileContentToWorker('.buildbot-diff', patch)
d.addCallback(lambda res: shell.ShellCommand.start(self))
@@ -1081,10 +1081,10 @@
if flag.get('name') == 'review':
review_status = flag.get('status')
if review_status == '+':
- patch_reviewer = flag.get('setter', '')
- self.setProperty('patch_reviewer', patch_reviewer)
+ reviewer = flag.get('setter', '')
+ self.setProperty('reviewer', reviewer)
if self.addURLs:
- self.addURL('Reviewed by: {}'.format(patch_reviewer), '')
+ self.addURL('Reviewed by: {}'.format(reviewer), '')
return 1
if review_status in ['-', '?']:
self._addToLog('stdio', 'Patch {} is marked r{}.\n'.format(patch_id, review_status))
@@ -1453,18 +1453,18 @@
return None
self._addToLog('stdio', '{} is a valid commiter.\n'.format(patch_committer))
- patch_reviewer = self.getProperty('patch_reviewer', '').lower()
- if not patch_reviewer:
+ reviewer = self.getProperty('reviewer', '').lower()
+ if not reviewer:
# Patch does not have r+ flag. This is acceptable, since the ChangeLog might have 'Reviewed by' in it.
self.descriptionDone = 'Validated committer'
self.finished(SUCCESS)
return None
- self.setProperty('patch_reviewer_full_name', self.full_name_from_email(patch_reviewer))
- if not self.is_reviewer(patch_reviewer):
- self.fail_build(patch_reviewer, 'reviewer')
+ self.setProperty('reviewer_full_name', self.full_name_from_email(reviewer))
+ if not self.is_reviewer(reviewer):
+ self.fail_build(reviewer, 'reviewer')
return None
- self._addToLog('stdio', '{} is a valid reviewer.\n'.format(patch_reviewer))
+ self._addToLog('stdio', '{} is a valid reviewer.\n'.format(reviewer))
self.finished(SUCCESS)
return None
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (291353 => 291354)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-03-16 15:25:06 UTC (rev 291353)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-03-16 16:56:52 UTC (rev 291354)
@@ -5174,7 +5174,7 @@
self.setupStep(ValidateCommiterAndReviewer())
self.setProperty('patch_id', '1234')
self.setProperty('patch_committer', 'commit...@webkit.org')
- self.setProperty('patch_reviewer', 'aakash_j...@apple.com')
+ self.setProperty('reviewer', 'aakash_j...@apple.com')
self.expectHidden(False)
self.assertEqual(ValidateCommiterAndReviewer.haltOnFailure, False)
self.expectOutcome(result=SUCCESS, state_string='Validated commiter and reviewer')
@@ -5209,7 +5209,7 @@
self.setupStep(ValidateCommiterAndReviewer())
self.setProperty('patch_id', '1234')
self.setProperty('patch_committer', 'aakash_j...@apple.com')
- self.setProperty('patch_reviewer', 'commit...@webkit.org')
+ self.setProperty('reviewer', 'commit...@webkit.org')
self.expectHidden(False)
self.expectOutcome(result=FAILURE, state_string='commit...@webkit.org does not have reviewer permissions')
return self.runStep()
Modified: trunk/Tools/ChangeLog (291353 => 291354)
--- trunk/Tools/ChangeLog 2022-03-16 15:25:06 UTC (rev 291353)
+++ trunk/Tools/ChangeLog 2022-03-16 16:56:52 UTC (rev 291354)
@@ -1,3 +1,20 @@
+2022-03-15 Jonathan Bedard <jbed...@apple.com>
+
+ [Merge-Queue] Rename patch_reviewer
+ https://bugs.webkit.org/show_bug.cgi?id=237916
+ <rdar://problem/90324765>
+
+ Reviewed by Aakash Jain.
+
+ Rename patch_reviewer to reviewer for compatibility with
+ pull requests.
+
+ * CISupport/ews-build/steps.py:
+ (ApplyPatch.start):
+ (BugzillaMixin._does_patch_have_acceptable_review_flag):
+ (ValidateCommiterAndReviewer.start):
+ * CISupport/ews-build/steps_unittest.py:
+
2022-03-16 Youenn Fablet <you...@apple.com>
Make MIMETypeRegistry::mimeTypeForPath take a StringView
