Changeset 249104 in webkit

Timestamp:

Aug 26, 2019 10:48:11 AM (5 years ago)

Author:

aakash_jain@apple.com

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.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/steps.py (modified) (1 diff)
• BuildSlaveSupport/ews-build/steps_unittest.py (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/steps.py

@@ -501 +501 @@
         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])
-
-        return {u'step': status}
+            if self.failedTestCount:
+                status = self.failedTestsFormatString % (self.failedTestCount, self.failedTestPluralSuffix)
+            else:
+                status += u' ({})'.format(Results[self.results])
+
+        return {u'step': unicode(status)}
 
 

trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py

@@ -259 +259 @@
             + 2,
         )
-        self.expectOutcome(result=FAILURE, state_string='8 style errors (failure)')
+        self.expectOutcome(result=FAILURE, state_string='8 style errors')
         return self.runStep()
 
@@ -1867 +1867 @@
             + 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()
 
@@ -1923 +1923 @@
             + 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()
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-08-26  Aakash Jain  <aakash_jain@apple.com>
+
+        [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  <jbedard@apple.com>