diff options
Diffstat (limited to 'tools/telemetry')
| -rw-r--r-- | tools/telemetry/telemetry/page/page_runner.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/telemetry/telemetry/page/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py index ab24745..99c44b2 100644 --- a/tools/telemetry/telemetry/page/page_runner.py +++ b/tools/telemetry/telemetry/page/page_runner.py @@ -60,6 +60,7 @@ class PageRunner(object): """Runs a given test against a given test.""" def __init__(self, page_set): self.page_set = page_set + self.has_called_will_run_page_set = False def __enter__(self): return self @@ -141,7 +142,6 @@ class PageRunner(object): state = _RunState() last_archive_path = None - is_first_run = True results_for_current_run = out_results try: @@ -155,7 +155,8 @@ class PageRunner(object): state.Close() state = _RunState() last_archive_path = page.archive_path - if (test.discard_first_result and is_first_run): + if (test.discard_first_result and + not self.has_called_will_run_page_set): # If discarding results, substitute a dummy object. results_for_current_run = ( page_benchmark_results.PageBenchmarkResults()) @@ -181,10 +182,6 @@ class PageRunner(object): self._WaitForThermalThrottlingIfNeeded(state.browser.platform) - if is_first_run: - is_first_run = False - test.WillRunPageSet(state.tab, results_for_current_run) - try: self._RunPage(options, page, state.tab, test, results_for_current_run) @@ -339,6 +336,10 @@ class PageRunner(object): results.AddFailure(page, msg, "") return False + if not self.has_called_will_run_page_set: + self.has_called_will_run_page_set = True + test.WillRunPageSet(tab, results) + test.WillNavigateToPage(page, tab) tab.Navigate(target_side_url, page.script_to_evaluate_on_commit) test.DidNavigateToPage(page, tab) |