Merge from Chromium at DEPS revision r216972
This commit was generated by merge_to_master.py.
Change-Id: Ie5904a921ece9c5959b52c8e0b74db09fa08f144
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base.py b/Tools/Scripts/webkitpy/layout_tests/port/base.py
index f8a6fac..5ab1250 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -188,9 +188,6 @@
self._pretty_patch_available = self.check_pretty_patch(logging=False)
return self._pretty_patch_available
- def should_retry_crashes(self):
- return self.get_option('retry_crashes', False)
-
def default_child_processes(self):
"""Return the number of drivers to use for this port."""
return self._executive.cpu_count()
@@ -985,13 +982,6 @@
self._websocket_server.stop()
self._websocket_server = None
- def exit_code_from_summarized_results(self, unexpected_results):
- """Given summarized results, compute the exit code to be returned by new-run-webkit-tests.
- Bots turn red when this function returns a non-zero value. By default, return the number of regressions
- to avoid turning bots red by flaky failures, unexpected passes, and missing results"""
- # Don't turn bots red for flaky failures, unexpected passes, and missing results.
- return unexpected_results['num_regressions']
-
#
# TEST EXPECTATION-RELATED METHODS
#
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
index 6b99360..55ff290 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -257,11 +257,6 @@
finally:
self._helper = None
-
- def exit_code_from_summarized_results(self, unexpected_results):
- # Turn bots red for missing results.
- return unexpected_results['num_regressions'] + unexpected_results['num_missing']
-
def configuration_specifier_macros(self):
return self.CONFIGURATION_SPECIFIER_MACROS
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/test.py b/Tools/Scripts/webkitpy/layout_tests/port/test.py
index df2c024..8871c87 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/test.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/test.py
@@ -103,10 +103,9 @@
#
TOTAL_TESTS = 106
TOTAL_SKIPS = 27
-TOTAL_RETRIES = 14
-UNEXPECTED_PASSES = 6
-UNEXPECTED_FAILURES = 17
+UNEXPECTED_PASSES = 1
+UNEXPECTED_FAILURES = 22
def unit_test_list():
tests = TestList()