Title: [276139] trunk/Tools
Revision
276139
Author
aakash_j...@apple.com
Date
2021-04-16 09:15:18 -0700 (Fri, 16 Apr 2021)

Log Message

[ews] Improve step description when layout-tests step is skipped
https://bugs.webkit.org/show_bug.cgi?id=224666

Reviewed by Jonathan Bedard.

* CISupport/ews-build/steps.py:
(RunWebKitTests.getResultSummary):
* CISupport/ews-build/steps_unittest.py: Updated unit-tests.

Modified Paths

Diff

Modified: trunk/Tools/CISupport/ews-build/steps.py (276138 => 276139)


--- trunk/Tools/CISupport/ews-build/steps.py	2021-04-16 15:46:21 UTC (rev 276138)
+++ trunk/Tools/CISupport/ews-build/steps.py	2021-04-16 16:15:18 UTC (rev 276139)
@@ -2270,6 +2270,10 @@
         if self.results != SUCCESS and self.incorrectLayoutLines:
             status = ' '.join(self.incorrectLayoutLines)
             return {'step': status}
+        if self.results == SKIPPED:
+            if self.getProperty('fast_commit_queue'):
+                return {'step': 'Skipped layout-tests in fast-cq mode'}
+            return {'step': 'Skipped layout-tests'}
 
         return super(RunWebKitTests, self).getResultSummary()
 

Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (276138 => 276139)


--- trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-04-16 15:46:21 UTC (rev 276138)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-04-16 16:15:18 UTC (rev 276139)
@@ -1721,7 +1721,7 @@
         self.setProperty('fullPlatform', 'mac')
         self.setProperty('configuration', 'debug')
         self.setProperty('fast_commit_queue', True)
-        self.expectOutcome(result=SKIPPED, state_string='layout-tests (skipped)')
+        self.expectOutcome(result=SKIPPED, state_string='Skipped layout-tests in fast-cq mode')
         return self.runStep()
 
     def test_skip_for_mac_wk2_passed_patch_on_commit_queue(self):
@@ -1731,7 +1731,7 @@
         self.setProperty('fullPlatform', 'mac')
         self.setProperty('configuration', 'debug')
         self.setProperty('passed_mac_wk2', True)
-        self.expectOutcome(result=SKIPPED, state_string='layout-tests (skipped)')
+        self.expectOutcome(result=SKIPPED, state_string='Skipped layout-tests')
         return self.runStep()
 
     def test_parse_results_json_regression(self):
@@ -2260,7 +2260,7 @@
         self.setProperty('fullPlatform', 'mac')
         self.setProperty('configuration', 'debug')
         self.setProperty('fast_commit_queue', True)
-        self.expectOutcome(result=SKIPPED, state_string='layout-tests (skipped)')
+        self.expectOutcome(result=SKIPPED, state_string='Skipped layout-tests in fast-cq mode')
         return self.runStep()
 
 

Modified: trunk/Tools/ChangeLog (276138 => 276139)


--- trunk/Tools/ChangeLog	2021-04-16 15:46:21 UTC (rev 276138)
+++ trunk/Tools/ChangeLog	2021-04-16 16:15:18 UTC (rev 276139)
@@ -1,3 +1,14 @@
+2021-04-16  Aakash Jain  <aakash_j...@apple.com>
+
+        [ews] Improve step description when layout-tests step is skipped
+        https://bugs.webkit.org/show_bug.cgi?id=224666
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/ews-build/steps.py:
+        (RunWebKitTests.getResultSummary):
+        * CISupport/ews-build/steps_unittest.py: Updated unit-tests.
+
 2021-04-16  Manuel Rego Casasnovas  <r...@igalia.com>
 
         Avoid converting HTML chars in _W3CTestConverter
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to