Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (259693 => 259694)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2020-04-08 00:34:20 UTC (rev 259693)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2020-04-08 00:38:33 UTC (rev 259694)
@@ -62,7 +62,7 @@
'^Downloaded built product$', '^Extracted built product$',
'^Cleaned and updated working directory$', '^Checked out required revision$', '^Updated working directory$',
'^Validated patch$', '^Killed old processes$', '^Configured build$', '^OS:.*Xcode:', '(skipped)',
- '^Printed configuration$', '^Checked patch relevance$', '^Deleted .git/index.lock$',
+ '^Printed configuration$', '^Patch contains relevant changes$', '^Deleted .git/index.lock$',
'^triggered.*$', '^Found modified ChangeLogs$', '^Created local git commit$', '^Set build summary$',
'^Validated commiter$', '^Validated commiter and reviewer$', '^Validated ChangeLog and Reviewer$',
'^Removed flags on bugzilla patch$', '^Checked patch status on other queues$']
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (259693 => 259694)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-04-08 00:34:20 UTC (rev 259693)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-04-08 00:38:33 UTC (rev 259694)
@@ -243,7 +243,7 @@
class CheckPatchRelevance(buildstep.BuildStep):
name = 'check-patch-relevance'
description = ['check-patch-relevance running']
- descriptionDone = ['Checked patch relevance']
+ descriptionDone = ['Patch contains relevant changes']
flunkOnFailure = True
haltOnFailure = True
@@ -332,12 +332,16 @@
self.finished(SUCCESS)
return None
- self._addToLog('stdio', 'This patch does not have relevant changes.')
+ self._addToLog('stdio', 'This patch does not contain relevant changes.')
self.finished(FAILURE)
self.build.results = SKIPPED
- self.build.buildFinished(['Patch {} doesn\'t have relevant changes'.format(self.getProperty('patch_id', ''))], SKIPPED)
+ self.build.buildFinished(['Patch {} doesn\'t contain relevant changes'.format(self.getProperty('patch_id', ''))], SKIPPED)
return None
+ def getResultSummary(self):
+ if self.results == FAILURE:
+ return {u'step': u'Patch doesn\'t contain relevant changes'}
+ return super(CheckPatchRelevance, self).getResultSummary()
class BugzillaMixin(object):
addURLs = False
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (259693 => 259694)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-04-08 00:34:20 UTC (rev 259693)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-04-08 00:38:33 UTC (rev 259694)
@@ -2165,7 +2165,7 @@
self.setProperty('buildername', 'JSC-Tests-EWS')
self.assertEqual(CheckPatchRelevance.haltOnFailure, True)
self.assertEqual(CheckPatchRelevance.flunkOnFailure, True)
- self.expectOutcome(result=SUCCESS, state_string='Checked patch relevance')
+ self.expectOutcome(result=SUCCESS, state_string='Patch contains relevant changes')
return self.runStep()
def test_queue_without_relevance_info(self):
@@ -2173,7 +2173,7 @@
self.setupStep(CheckPatchRelevance())
self.setProperty('buildername', 'Commit-Queue')
CheckPatchStatusOnEWSQueues.get_patch_status = lambda cls, patch_id, queue: FAILURE
- self.expectOutcome(result=SUCCESS, state_string='Checked patch relevance')
+ self.expectOutcome(result=SUCCESS, state_string='Patch contains relevant changes')
return self.runStep()
def test_non_relevant_patch(self):
@@ -2182,7 +2182,7 @@
self.setProperty('buildername', 'JSC-Tests-EWS')
self.setProperty('patch_id', '1234')
CheckPatchStatusOnEWSQueues.get_patch_status = lambda cls, patch_id, queue: FAILURE
- self.expectOutcome(result=FAILURE, state_string='Checked patch relevance (failure)')
+ self.expectOutcome(result=FAILURE, state_string='Patch doesn\'t contain relevant changes')
return self.runStep()
Modified: trunk/Tools/ChangeLog (259693 => 259694)
--- trunk/Tools/ChangeLog 2020-04-08 00:34:20 UTC (rev 259693)
+++ trunk/Tools/ChangeLog 2020-04-08 00:38:33 UTC (rev 259694)
@@ -1,3 +1,17 @@
+2020-04-07 Aakash Jain <aakash_j...@apple.com>
+
+ [ews] Improve summary for CheckPatchRelevance build step
+ https://bugs.webkit.org/show_bug.cgi?id=210146
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/ews-build/steps.py:
+ (CheckPatchRelevance): Improved success message.
+ (CheckPatchRelevance.start):
+ (CheckPatchRelevance.getResultSummary): Improved failure message.
+ * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
+ * BuildSlaveSupport/ews-app/ews/views/statusbubble.py: Updated accordingly.
+
2020-04-07 Jiewen Tan <jiewen_...@apple.com>
[WebAuthn] Cancel WebAuthn requests when users cancel LocalAuthentication prompts
