| Index: tools/telemetry/telemetry/page/page_runner.py
|
| diff --git a/tools/telemetry/telemetry/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py
|
| similarity index 94%
|
| rename from tools/telemetry/telemetry/page_runner.py
|
| rename to tools/telemetry/telemetry/page/page_runner.py
|
| index 5a167825ba3ca4e616400d345f70637d0df8f129..5141fdb90682f435efa212b401dc711fd72e87f0 100644
|
| --- a/tools/telemetry/telemetry/page_runner.py
|
| +++ b/tools/telemetry/telemetry/page/page_runner.py
|
| @@ -9,12 +9,11 @@ import traceback
|
| import urlparse
|
| import random
|
|
|
| -from telemetry import browser_gone_exception
|
| -from telemetry import page_filter as page_filter_module
|
| -from telemetry import page_test
|
| -from telemetry import tab_crash_exception
|
| -from telemetry import util
|
| -from telemetry import wpr_modes
|
| +from telemetry.core import util
|
| +from telemetry.core import wpr_modes
|
| +from telemetry.core import exceptions
|
| +from telemetry.page import page_filter as page_filter_module
|
| +from telemetry.page import page_test
|
|
|
| class PageState(object):
|
| def __init__(self):
|
| @@ -145,7 +144,7 @@ class PageRunner(object):
|
|
|
| try:
|
| self._RunPage(options, page, state.tab, test, results)
|
| - except tab_crash_exception.TabCrashException:
|
| + except exceptions.TabCrashException:
|
| stdout = ''
|
| if not options.show_stdout:
|
| stdout = state.browser.GetStandardOutput()
|
| @@ -163,7 +162,7 @@ class PageRunner(object):
|
| state.Close()
|
|
|
| break
|
| - except browser_gone_exception.BrowserGoneException:
|
| + except exceptions.BrowserGoneException:
|
| logging.warning('Lost connection to browser. Retrying.')
|
| state.Close()
|
| tries -= 1
|
| @@ -189,10 +188,10 @@ class PageRunner(object):
|
| page.url)
|
| results.AddFailure(page, ex, traceback.format_exc())
|
| return
|
| - except tab_crash_exception.TabCrashException, ex:
|
| + except exceptions.TabCrashException, ex:
|
| results.AddFailure(page, ex, traceback.format_exc())
|
| raise
|
| - except browser_gone_exception.BrowserGoneException:
|
| + except exceptions.BrowserGoneException:
|
| raise
|
| except Exception, ex:
|
| logging.error('Unexpected failure while running %s: %s',
|
| @@ -214,10 +213,10 @@ class PageRunner(object):
|
| logging.warning('Timed out while running %s', page.url)
|
| results.AddFailure(page, ex, traceback.format_exc())
|
| return
|
| - except tab_crash_exception.TabCrashException, ex:
|
| + except exceptions.TabCrashException, ex:
|
| results.AddFailure(page, ex, traceback.format_exc())
|
| raise
|
| - except browser_gone_exception.BrowserGoneException:
|
| + except exceptions.BrowserGoneException:
|
| raise
|
| except Exception, ex:
|
| logging.error('Unexpected failure while running %s: %s',
|
|
|