Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(472)

Unified Diff: tools/telemetry/telemetry/results/page_test_results.py

Issue 439553002: Move output of [OK] and [FAILED] from AddValue to DidRunPage for gtest output. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/results/page_test_results.py
diff --git a/tools/telemetry/telemetry/results/page_test_results.py b/tools/telemetry/telemetry/results/page_test_results.py
index 68be0c40f3e3344c614f6bb991fa418d759e32a7..75ddd624a32227c7ecdf2eeaccabf5ef2b5441be 100644
--- a/tools/telemetry/telemetry/results/page_test_results.py
+++ b/tools/telemetry/telemetry/results/page_test_results.py
@@ -71,6 +71,11 @@ class PageTestResults(object):
return self._current_page_run.page
@property
+ def current_page_run(self):
+ assert self._current_page_run, 'Not currently running test.'
+ return self._current_page_run
+
+ @property
def all_page_runs(self):
return self._all_page_runs
@@ -106,7 +111,7 @@ class PageTestResults(object):
def WillRunPage(self, page):
assert not self._current_page_run, 'Did not call DidRunPage.'
self._current_page_run = page_run.PageRun(page)
- self._progress_reporter.WillRunPage(page)
+ self._progress_reporter.WillRunPage(self)
def DidRunPage(self, page, discard_run=False): # pylint: disable=W0613
"""
@@ -116,16 +121,25 @@ class PageTestResults(object):
associated results.
"""
assert self._current_page_run, 'Did not call WillRunPage.'
+ self._progress_reporter.DidRunPage(self)
if not discard_run:
self._all_page_runs.append(self._current_page_run)
self._current_page_run = None
- def WillAttemptPageRun(self):
+ def WillAttemptPageRun(self, attempt_count, max_attempts):
"""To be called when a single attempt on a page run is starting.
This is called between WillRunPage and DidRunPage and can be
called multiple times, one for each attempt.
+
+ Args:
+ attempt_count: The current attempt number, start at 1
+ (attempt_count == 1 for the first attempt, 2 for second
+ attempt, and so on).
+ max_attempts: Maximum number of page run attempts before failing.
"""
+ self._progress_reporter.WillAttemptPageRun(
+ self, attempt_count, max_attempts)
# Clear any values from previous attempts for this page run.
self._current_page_run.ClearValues()
@@ -149,10 +163,6 @@ class PageTestResults(object):
value.name]
assert value.IsMergableWith(representative_value)
- # TODO(chrishenry): Kill this in a separate patch.
- def AddSuccess(self, page):
- self._progress_reporter.DidAddSuccess(page)
-
def PrintSummary(self):
self._progress_reporter.DidFinishAllTests(self)
for output_formatter in self._output_formatters:

Powered by Google App Engine
This is Rietveld 408576698