Commit 55a7c6a5 authored by Sergiy Belozorov's avatar Sergiy Belozorov Committed by Commit Bot

[tools] Remove near_timeouts and timeouts fields

R=machenbach@chromium.org, tmrts@chromium.org

No-Tree-Checks: true
Bug: chromium:841700
Change-Id: I201f3f029406bf788182e3cc6cf62ff68839a00d
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1603802
Commit-Queue: Sergiy Belozorov <sergiyb@chromium.org>
Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#61420}
parent 40d9fca8
...@@ -178,20 +178,11 @@ class ResultTracker(object): ...@@ -178,20 +178,11 @@ class ResultTracker(object):
... ...
], ],
"errors": [<list of strings describing errors>], "errors": [<list of strings describing errors>],
# These two fields are deprecated and will soon be removed.
"timeouts": [<list of traces which have timed out at least once>],
"near_timeouts": [<list of traces which have at least once run for longer
than 90% of the configured timeout>],
} }
""" """
def __init__(self): def __init__(self):
self.traces = {} self.traces = {}
self.errors = [] self.errors = []
# TODO(sergiyb): Deprecate self.timeouts/near_timeouts and compute them in
# the recipe based on self.runnable_durations. Also cleanup RunnableConfig
# by removing has_timeouts/has_near_timeouts there.
self.timeouts = []
self.near_timeouts = [] # > 90% of the max runtime
self.runnables = {} self.runnables = {}
def AddTraceResult(self, trace, result, stddev): def AddTraceResult(self, trace, result, stddev):
...@@ -234,8 +225,6 @@ class ResultTracker(object): ...@@ -234,8 +225,6 @@ class ResultTracker(object):
return { return {
'traces': self.traces.values(), 'traces': self.traces.values(),
'errors': self.errors, 'errors': self.errors,
'timeouts': self.timeouts,
'near_timeouts': self.near_timeouts,
'runnables': self.runnables.values(), 'runnables': self.runnables.values(),
} }
...@@ -454,8 +443,6 @@ class RunnableConfig(GraphConfig): ...@@ -454,8 +443,6 @@ class RunnableConfig(GraphConfig):
""" """
def __init__(self, suite, parent, arch): def __init__(self, suite, parent, arch):
super(RunnableConfig, self).__init__(suite, parent, arch) super(RunnableConfig, self).__init__(suite, parent, arch)
self.has_timeouts = False
self.has_near_timeouts = False
self.arch = arch self.arch = arch
@property @property
...@@ -619,15 +606,11 @@ class Platform(object): ...@@ -619,15 +606,11 @@ class Platform(object):
except OSError: except OSError:
logging.exception(title % 'OSError') logging.exception(title % 'OSError')
raise raise
if output.duration > 0.9 * runnable.timeout:
runnable.has_near_timeouts = True
if output.stdout: if output.stdout:
logging.info(title % 'Stdout' + '\n%s', output.stdout) logging.info(title % 'Stdout' + '\n%s', output.stdout)
if output.stderr: # pragma: no cover if output.stderr: # pragma: no cover
# Print stderr for debugging. # Print stderr for debugging.
logging.info(title % 'Stderr' + '\n%s', output.stderr) logging.info(title % 'Stderr' + '\n%s', output.stderr)
if output.timed_out:
runnable.has_timeouts = True
logging.warning('>>> Test timed out after %ss.', runnable.timeout) logging.warning('>>> Test timed out after %ss.', runnable.timeout)
if output.exit_code != 0: if output.exit_code != 0:
logging.warning('>>> Test crashed with exit code %d.', output.exit_code) logging.warning('>>> Test crashed with exit code %d.', output.exit_code)
...@@ -1108,11 +1091,6 @@ def Main(argv): ...@@ -1108,11 +1091,6 @@ def Main(argv):
have_failed_tests = True have_failed_tests = True
if attempts_left: if attempts_left:
logging.info('>>> Retrying suite: %s', runnable_name) logging.info('>>> Retrying suite: %s', runnable_name)
if runnable.has_timeouts:
result_tracker.timeouts.append(runnable_name)
if runnable.has_near_timeouts:
result_tracker.near_timeouts.append(runnable_name)
except MaxTotalDurationReachedError: except MaxTotalDurationReachedError:
have_failed_tests = True have_failed_tests = True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment