Title: [249104] trunk/Tools
- Revision
- 249104
- Author
- [email protected]
- Date
- 2019-08-26 10:48:11 -0700 (Mon, 26 Aug 2019)
Log Message
[EWS] Do not append additional '(failure)' string at the end of custom failure message in EWS Buildbot
https://bugs.webkit.org/show_bug.cgi?id=201140
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(TestWithFailureCount.getResultSummary): Do not append (failure) when in case of custom status.
* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests accordingly.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (249103 => 249104)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-08-26 17:36:28 UTC (rev 249103)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-08-26 17:48:11 UTC (rev 249104)
@@ -500,13 +500,13 @@
def getResultSummary(self):
status = self.name
- if self.results != SUCCESS and self.failedTestCount:
- status = self.failedTestsFormatString % (self.failedTestCount, self.failedTestPluralSuffix)
-
if self.results != SUCCESS:
- status += u' ({})'.format(Results[self.results])
+ if self.failedTestCount:
+ status = self.failedTestsFormatString % (self.failedTestCount, self.failedTestPluralSuffix)
+ else:
+ status += u' ({})'.format(Results[self.results])
- return {u'step': status}
+ return {u'step': unicode(status)}
class CheckStyle(TestWithFailureCount):
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (249103 => 249104)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-08-26 17:36:28 UTC (rev 249103)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-08-26 17:48:11 UTC (rev 249104)
@@ -258,7 +258,7 @@
Total errors found: 8 in 48 files''')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='8 style errors (failure)')
+ self.expectOutcome(result=FAILURE, state_string='8 style errors')
return self.runStep()
def test_failures_no_style_issues(self):
@@ -1866,7 +1866,7 @@
''')
+ 1,
)
- self.expectOutcome(result=FAILURE, state_string='1 api test failed or timed out (failure)')
+ self.expectOutcome(result=FAILURE, state_string='1 api test failed or timed out')
return self.runStep()
def test_multiple_failures_and_timeouts(self):
@@ -1922,7 +1922,7 @@
''')
+ 4,
)
- self.expectOutcome(result=FAILURE, state_string='4 api tests failed or timed out (failure)')
+ self.expectOutcome(result=FAILURE, state_string='4 api tests failed or timed out')
return self.runStep()
def test_unexpected_failure(self):
Modified: trunk/Tools/ChangeLog (249103 => 249104)
--- trunk/Tools/ChangeLog 2019-08-26 17:36:28 UTC (rev 249103)
+++ trunk/Tools/ChangeLog 2019-08-26 17:48:11 UTC (rev 249104)
@@ -1,3 +1,14 @@
+2019-08-26 Aakash Jain <[email protected]>
+
+ [EWS] Do not append additional '(failure)' string at the end of custom failure message in EWS Buildbot
+ https://bugs.webkit.org/show_bug.cgi?id=201140
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/ews-build/steps.py:
+ (TestWithFailureCount.getResultSummary): Do not append (failure) when in case of custom status.
+ * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests accordingly.
+
2019-08-26 Jonathan Bedard <[email protected]>
run-webkit-tests: Cap the number of automatically booted simulators at 12
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
