Title: [293168] trunk/Tools
- Revision
- 293168
- Author
- jbed...@apple.com
- Date
- 2022-04-21 07:46:19 -0700 (Thu, 21 Apr 2022)
Log Message
[Merge-Queue] Allow "Rubber-stamped" as review message
https://bugs.webkit.org/show_bug.cgi?id=239601
<rdar://problem/92091819>
Reviewed by Aakash Jain.
* Tools/CISupport/ews-build/steps.py:
(ValidateCommitMessage.evaluateCommand): Allow "Rubber-stamped by."
* Tools/CISupport/ews-build/steps_unittest.py:
Canonical link: https://commits.webkit.org/249850@main
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (293167 => 293168)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-04-21 13:20:21 UTC (rev 293167)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-04-21 14:46:19 UTC (rev 293168)
@@ -4940,6 +4940,12 @@
haltOnFailure = False
flunkOnFailure = True
OOPS_RE = re.compile(r'\(OO*PP*S!\)')
+ REVIEWED_STRINGS = (
+ 'Reviewed by',
+ 'Unreviewed',
+ 'Rubber-stamped by',
+ 'Rubber stamped by',
+ )
def __init__(self, **kwargs):
super(ValidateCommitMessage, self).__init__(logEnviron=False, timeout=60, **kwargs)
@@ -4971,9 +4977,10 @@
if self.OOPS_RE.search(log_text):
self.summary = 'Commit message contains (OOPS!)'
rc = FAILURE
- elif 'Reviewed by' not in log_text and 'Unreviewed' not in log_text:
+ elif all([candidate not in log_text for candidate in self.REVIEWED_STRINGS]):
self.summary = 'No reviewer information in commit message'
rc = FAILURE
+
else:
self.summary = 'Error parsing commit message'
rc = FAILURE
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (293167 => 293168)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-04-21 13:20:21 UTC (rev 293167)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-04-21 14:46:19 UTC (rev 293168)
@@ -6189,6 +6189,26 @@
self.expectOutcome(result=SUCCESS, state_string='Validated commit message')
return self.runStep()
+ def test_success_rubber_stamped(self):
+ self.setupStep(ValidateCommitMessage())
+ self.setProperty('github.number', '1234')
+ self.setProperty('github.base.ref', 'main')
+ self.setProperty('github.head.ref', 'eng/pull-request-branch')
+ self.expectRemoteCommands(
+ ExpectShell(workdir='wkdir',
+ logEnviron=False,
+ timeout=60,
+ command=['git', 'log', 'eng/pull-request-branch', '^main'])
+ + 0
+ + ExpectShell.log('stdio', stdout='''[build.webkit.org] Support identifiers on dashboard
+https://bugs.webkit.org/show_bug.cgi?id=239473
+<rdar://problem/76852365>
+
+Rubber-stamped by Aakash Jain.'''),
+ )
+ self.expectOutcome(result=SUCCESS, state_string='Validated commit message')
+ return self.runStep()
+
def test_failure_oops(self):
self.setupStep(ValidateCommitMessage())
self.setProperty('github.number', '1234')
Modified: trunk/Tools/ChangeLog (293167 => 293168)
--- trunk/Tools/ChangeLog 2022-04-21 13:20:21 UTC (rev 293167)
+++ trunk/Tools/ChangeLog 2022-04-21 14:46:19 UTC (rev 293168)
@@ -1,3 +1,15 @@
+2022-04-21 Jonathan Bedard <jbed...@apple.com>
+
+ [Merge-Queue] Allow "Rubber-stamped" as review message
+ https://bugs.webkit.org/show_bug.cgi?id=239601
+ <rdar://problem/92091819>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/ews-build/steps.py:
+ (ValidateCommitMessage.evaluateCommand): Allow "Rubber-stamped by."
+ * CISupport/ews-build/steps_unittest.py:
+
2022-04-20 Jonathan Bedard <jbed...@apple.com>
[build.webkit.org] Support identifiers on dashboard
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
