summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkbr <kbr@chromium.org>2014-10-19 07:32:08 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-19 14:32:31 +0000
commit89b463ddd92b4c9abe7898506ccb4935cef75d1e (patch)
tree66182dec4d5cbe2d6ac6425b1728636a09e19e18
parent1be6b8a362cbefdb843df448ed5ad08d57ff10a5 (diff)
downloadchromium_src-89b463ddd92b4c9abe7898506ccb4935cef75d1e.zip
chromium_src-89b463ddd92b4c9abe7898506ccb4935cef75d1e.tar.gz
chromium_src-89b463ddd92b4c9abe7898506ccb4935cef75d1e.tar.bz2
Revert of Revert of [Telemetry] Set the number of attempts to retry a test if browser or tab crash to 1 (patchset #1 id:1 of https://codereview.chromium.org/661303002/)
Reason for revert: The removal of Telemetry's retry logic wasn't the cause of the intermittent crashes on the GPU bots. Original issue's description: > Revert of [Telemetry] Set the number of attempts to retry a test if browser or tab crash to 1 (patchset #2 id:20001 of https://codereview.chromium.org/659753003/) > > Reason for revert: > Possible cause of gpu telemetry bot flake > > Original issue's description: > > [Telemetry] Set the number of attempts to retry a test to 1 > > > > **SHERIFFS: if telemetry perf tests on waterfall become more flaky, this patch can be safely reverted. > > > > BUG=422339 > > > > Committed: https://crrev.com/f5b75f261be7779ccca14d09ddaabb3e4ee5ee03 > > Cr-Commit-Position: refs/heads/master@{#299716} > > TBR=tonyg@chromium.org,dtu@chromium.org,nednguyen@google.com > NOTREECHECKS=true > NOTRY=true > BUG=422339 > > Committed: https://crrev.com/1c141bedc45cdef1ac7b7264ea1288c33e33d106 > Cr-Commit-Position: refs/heads/master@{#300218} TBR=tonyg@chromium.org,dtu@chromium.org,nednguyen@google.com,hendrikw@chromium.org NOTREECHECKS=true NOTRY=true BUG=422339 Review URL: https://codereview.chromium.org/662963002 Cr-Commit-Position: refs/heads/master@{#300225}
-rw-r--r--tools/telemetry/telemetry/page/page_runner_unittest.py4
-rw-r--r--tools/telemetry/telemetry/page/page_test.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/telemetry/telemetry/page/page_runner_unittest.py b/tools/telemetry/telemetry/page/page_runner_unittest.py
index 894c84f..46af39b 100644
--- a/tools/telemetry/telemetry/page/page_runner_unittest.py
+++ b/tools/telemetry/telemetry/page/page_runner_unittest.py
@@ -188,6 +188,10 @@ class PageRunnerTests(unittest.TestCase):
self.has_crashed = True
raise exceptions.BrowserGoneException(tab.browser)
+ @property
+ def attempts(self):
+ return 3
+
options = options_for_unittests.GetCopy()
options.output_formats = ['csv']
options.suppress_gtest_report = True
diff --git a/tools/telemetry/telemetry/page/page_test.py b/tools/telemetry/telemetry/page/page_test.py
index 386f68d..2828202 100644
--- a/tools/telemetry/telemetry/page/page_test.py
+++ b/tools/telemetry/telemetry/page/page_test.py
@@ -133,7 +133,7 @@ class PageTest(command_line.Command):
def attempts(self):
"""Maximum number of times test will be attempted."""
# Do NOT override this method (crbug.com/422339).
- return 3
+ return 1
@property
def max_failures(self):