Modified: trunk/Tools/CISupport/ews-build/steps.py (278988 => 278989)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-06-17 15:57:59 UTC (rev 278988)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-06-17 16:04:15 UTC (rev 278989)
@@ -2350,7 +2350,7 @@
message = 'Passed layout tests'
self.descriptionDone = message
self.build.results = SUCCESS
- if not first_results_did_exceed_test_failure_limit:
+ if (not first_results_did_exceed_test_failure_limit) and flaky_failures:
pluralSuffix = 's' if len(flaky_failures) > 1 else ''
message = 'Found flaky test{}: {}'.format(pluralSuffix, flaky_failures_string)
for flaky_failure in flaky_failures:
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (278988 => 278989)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-06-17 15:57:59 UTC (rev 278988)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-06-17 16:04:15 UTC (rev 278989)
@@ -1915,7 +1915,25 @@
self.assertEqual(self.getProperty('build_summary'), 'Found flaky tests: test1, test2')
return rc
+ def test_first_run_failed_unexpectedly(self):
+ self.configureStep()
+ self.setProperty('fullPlatform', 'ios-simulator')
+ self.setProperty('configuration', 'release')
+ self.setProperty('first_run_failures', [])
+ self.expectRemoteCommands(
+ ExpectShell(workdir='wkdir',
+ logfiles={'json': self.jsonFileName},
+ logEnviron=False,
+ command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
+ )
+ + 0,
+ )
+ self.expectOutcome(result=SUCCESS, state_string='Passed layout tests')
+ rc = self.runStep()
+ self.assertEqual(self.getProperty('build_summary'), 'Passed layout tests')
+ return rc
+
class TestRunWebKitTestsInStressMode(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
Modified: trunk/Tools/ChangeLog (278988 => 278989)
--- trunk/Tools/ChangeLog 2021-06-17 15:57:59 UTC (rev 278988)
+++ trunk/Tools/ChangeLog 2021-06-17 16:04:15 UTC (rev 278989)
@@ -1,3 +1,14 @@
+2021-06-17 Aakash Jain <aakash_j...@apple.com>
+
+ [ews] Improve build summary about finding flaky test in ReRunWebKitTests
+ https://bugs.webkit.org/show_bug.cgi?id=227123
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/steps.py:
+ (ReRunWebKitTests.evaluateCommand):
+ * CISupport/ews-build/steps_unittest.py:
+
2021-06-17 David Kilzer <ddkil...@apple.com>
REGRESSION (r278536): Wrong comment character used in coverage.xcconfig
