| Index: trunk/src/tools/telemetry/telemetry/page/page_runner.py
|
| ===================================================================
|
| --- trunk/src/tools/telemetry/telemetry/page/page_runner.py (revision 284496)
|
| +++ trunk/src/tools/telemetry/telemetry/page/page_runner.py (working copy)
|
| @@ -27,8 +27,8 @@
|
| from telemetry.results import results_options
|
| from telemetry.util import cloud_storage
|
| from telemetry.util import exception_formatter
|
| -from telemetry.value import failure
|
|
|
| +
|
| class _RunState(object):
|
| def __init__(self):
|
| self.browser = None
|
| @@ -498,8 +498,7 @@
|
|
|
| for page in pages_missing_archive_path + pages_missing_archive_data:
|
| results.StartTest(page)
|
| - results.AddValue(failure.FailureValue.FromMessage(
|
| - page, 'Page set archive doesn\'t exist.'))
|
| + results.AddFailureMessage(page, 'Page set archive doesn\'t exist.')
|
| results.StopTest(page)
|
|
|
| return [page for page in pages if page not in
|
| @@ -522,7 +521,7 @@
|
| results.AddSuccess(page)
|
| else:
|
| msg = 'Exception while running %s' % page.url
|
| - results.AddValue(failure.FailureValue(page, sys.exc_info()))
|
| + results.AddFailure(page, sys.exc_info())
|
| exception_formatter.PrintFormattedException(msg=msg)
|
|
|
| try:
|
| @@ -542,7 +541,7 @@
|
| else:
|
| exception_formatter.PrintFormattedException(
|
| msg='Failure while running %s' % page.url)
|
| - results.AddValue(failure.FailureValue(page, sys.exc_info()))
|
| + results.AddFailure(page, sys.exc_info())
|
| except (util.TimeoutException, exceptions.LoginException,
|
| exceptions.ProfilingException):
|
| ProcessError()
|
| @@ -555,7 +554,7 @@
|
| except Exception:
|
| exception_formatter.PrintFormattedException(
|
| msg='Unhandled exception while running %s' % page.url)
|
| - results.AddValue(failure.FailureValue(page, sys.exc_info()))
|
| + results.AddFailure(page, sys.exc_info())
|
| else:
|
| if expectation == 'fail':
|
| logging.warning('%s was expected to fail, but passed.\n', page.url)
|
|
|