Skip to content

Commit

Permalink
[EWS] Increase early exit threshold for RunWebKitTests step
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=248826
rdar://103031287

Reviewed by Jonathan Bedard and Alexey Proskuryakov.

Increase the early exit threshold for the RunWebKitTests step from 30 to 60
to increase the likelihood of producing meaningful feedback on pull requests.

This is indented to be a temporary increase as we work to make improvements to
EWS turnaround time (webkit.org/b/248828).

* Tools/CISupport/ews-build/steps.py:
(RunWebKitTests):
* Tools/CISupport/ews-build/steps_unittest.py:
(test_success):
(test_warnings):
(test_flaky_failures_in_first_run):
(test_first_run_failed_unexpectedly):
(test_too_many_flaky_failures_in_first_and_second_run):
(TestRunWebKitTestsWithoutChange.test_success):
(TestRunWebKitTestsWithoutChange.test_run_subtest_tests_success):
(TestRunWebKitTestsWithoutChange.test_run_subtest_tests_removes_skipped_that_fails):
(TestRunWebKitTestsWithoutChange.test_run_subtest_tests_fail):
(TestRunWebKitTestsWithoutChange.test_run_subtest_tests_limit_exceeded):
(TestRunWebKitTestsWithoutChange.test_failure):
(TestRunWebKit1Tests.test_success):
(TestRunWebKit1Tests.test_failure):

Canonical link: https://commits.webkit.org/257442@main
  • Loading branch information
ryanhaddad committed Dec 7, 2022
1 parent 925aa47 commit 91b71c3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Tools/CISupport/ews-build/steps.py
Expand Up @@ -3155,7 +3155,7 @@ class RunWebKitTests(shell.Test, AddToLogMixin):
test_failures_log_name = 'test-failures'
results_db_log_name = 'results-db'
ENABLE_GUARD_MALLOC = False
EXIT_AFTER_FAILURES = '30'
EXIT_AFTER_FAILURES = '60'
command = ['python3', 'Tools/Scripts/run-webkit-tests',
'--no-build',
'--no-show-results',
Expand Down
40 changes: 20 additions & 20 deletions Tools/CISupport/ews-build/steps_unittest.py
Expand Up @@ -1858,7 +1858,7 @@ def test_success(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', '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'],
command=['python3', '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', '60', '--skip-failing-tests'],
)
+ 0,
)
Expand All @@ -1873,7 +1873,7 @@ def test_warnings(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', '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'],
command=['python3', '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', '60', '--skip-failing-tests'],
)
+ 0
+ ExpectShell.log('stdio', stdout='''Unexpected flakiness: timeouts (2)
Expand Down Expand Up @@ -1920,7 +1920,7 @@ def test_parse_results_json_regression(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', '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'],
command=['python3', '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', '60', '--skip-failing-tests'],
)
+ 2
+ ExpectShell.log('json', stdout=self.results_json_regressions),
Expand Down Expand Up @@ -1949,7 +1949,7 @@ def test_parse_results_json_flakes(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', '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'],
command=['python3', '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', '60', '--skip-failing-tests'],
)
+ 0
+ ExpectShell.log('json', stdout=self.results_json_flakes),
Expand All @@ -1968,7 +1968,7 @@ def test_parse_results_json_flakes_and_regressions(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', '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'],
command=['python3', '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', '60', '--skip-failing-tests'],
)
+ 2
+ ExpectShell.log('json', stdout=self.results_json_mix_flakes_and_regression),
Expand All @@ -1987,7 +1987,7 @@ def test_parse_results_json_with_newlines(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', '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'],
command=['python3', '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', '60', '--skip-failing-tests'],
)
+ 2
+ ExpectShell.log('json', stdout=self.results_json_with_newlines),
Expand All @@ -2006,7 +2006,7 @@ def test_parse_results_json_with_missing_results(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', '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'],
command=['python3', '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', '60', '--skip-failing-tests'],
)
+ 2
+ ExpectShell.log('json', stdout=self.results_with_missing_results),
Expand All @@ -2027,7 +2027,7 @@ def test_unexpected_error(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--debug', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--debug', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '60', '--skip-failing-tests'],
)
+ ExpectShell.log('stdio', stdout='Unexpected error.')
+ 254,
Expand All @@ -2043,7 +2043,7 @@ def test_failure(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', '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'],
command=['python3', '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', '60', '--skip-failing-tests'],
)
+ ExpectShell.log('stdio', stdout='9 failures found.')
+ 2,
Expand Down Expand Up @@ -2108,7 +2108,7 @@ def test_flaky_failures_in_first_run(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', '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'],
command=['python3', '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', '60', '--skip-failing-tests'],
)
+ 0,
)
Expand All @@ -2126,7 +2126,7 @@ def test_first_run_failed_unexpectedly(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', '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'],
command=['python3', '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', '60', '--skip-failing-tests'],
)
+ 0,
)
Expand All @@ -2145,7 +2145,7 @@ def test_too_many_flaky_failures_in_first_and_second_run(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', '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'],
command=['python3', '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', '60', '--skip-failing-tests'],
)
+ 2,
)
Expand Down Expand Up @@ -2307,7 +2307,7 @@ def test_success(self):
'--release',
'--results-directory', 'layout-test-results',
'--debug-rwt-logging',
'--exit-after-n-failures', '30',
'--exit-after-n-failures', '60',
'--skip-failing-tests'],
)
+ 0,
Expand All @@ -2334,7 +2334,7 @@ def test_run_subtest_tests_success(self):
'--release',
'--results-directory', 'layout-test-results',
'--debug-rwt-logging',
'--exit-after-n-failures', '30',
'--exit-after-n-failures', '60',
'--skip-failing-tests',
'--skipped=always',
'test1.html', 'test2.html', 'test3.html', 'test4.html', 'test5.html'],
Expand Down Expand Up @@ -2363,7 +2363,7 @@ def test_run_subtest_tests_removes_skipped_that_fails(self):
'--release',
'--results-directory', 'layout-test-results',
'--debug-rwt-logging',
'--exit-after-n-failures', '30',
'--exit-after-n-failures', '60',
'--skip-failing-tests',
'--skipped=always',
'test-was-skipped-patch-removed-expectation-but-still-fails.html'],
Expand Down Expand Up @@ -2392,7 +2392,7 @@ def test_run_subtest_tests_fail(self):
'--release',
'--results-directory', 'layout-test-results',
'--debug-rwt-logging',
'--exit-after-n-failures', '30',
'--exit-after-n-failures', '60',
'--skip-failing-tests',
'--skipped=always',
'test-fails-withpatch1.html', 'test-fails-withpatch2.html', 'test-pre-existent-failure1.html', 'test-pre-existent-failure2.html'],
Expand Down Expand Up @@ -2423,7 +2423,7 @@ def test_run_subtest_tests_limit_exceeded(self):
'--release',
'--results-directory', 'layout-test-results',
'--debug-rwt-logging',
'--exit-after-n-failures', '30',
'--exit-after-n-failures', '60',
'--skip-failing-tests'],
)
+ 0,
Expand All @@ -2448,7 +2448,7 @@ def test_failure(self):
'--release',
'--results-directory', 'layout-test-results',
'--debug-rwt-logging',
'--exit-after-n-failures', '30',
'--exit-after-n-failures', '60',
'--skip-failing-tests'],
)
+ ExpectShell.log('stdio', stdout='9 failures found.')
Expand All @@ -2475,7 +2475,7 @@ def test_success(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--debug', '--dump-render-tree', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--debug', '--dump-render-tree', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '60', '--skip-failing-tests'],
)
+ 0,
)
Expand All @@ -2490,7 +2490,7 @@ def test_failure(self):
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
logEnviron=False,
command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--dump-render-tree', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--dump-render-tree', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '60', '--skip-failing-tests'],
)
+ ExpectShell.log('stdio', stdout='9 failures found.')
+ 2,
Expand Down

0 comments on commit 91b71c3

Please sign in to comment.