| Index: tools/telemetry/telemetry/page/page_measurement_unittest_base.py
|
| diff --git a/tools/telemetry/telemetry/page/page_measurement_unittest_base.py b/tools/telemetry/telemetry/page/page_measurement_unittest_base.py
|
| index 088fa237a0d79410acb0ab2f350b9c65cd7182d7..fdd3730dff8d00394328d5cb5601c613395728f9 100644
|
| --- a/tools/telemetry/telemetry/page/page_measurement_unittest_base.py
|
| +++ b/tools/telemetry/telemetry/page/page_measurement_unittest_base.py
|
| @@ -1,15 +1,17 @@
|
| -# Copyright 2012 The Chromium Authors. All rights reserved.
|
| +# Copyright 2014 The Chromium Authors. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| import unittest
|
|
|
| +from telemetry import benchmark
|
| from telemetry.core import exceptions
|
| from telemetry.core import util
|
| from telemetry.page import page_runner
|
| from telemetry.page import page as page_module
|
| from telemetry.page import page_set as page_set_module
|
| from telemetry.page import page_test
|
| +from telemetry.results import results_options
|
| from telemetry.page import test_expectations
|
| from telemetry.unittest import options_for_unittests
|
|
|
| @@ -25,6 +27,10 @@ class BasicTestPage(page_module.Page):
|
| interaction.End()
|
|
|
|
|
| +class EmptyMetadataForTest(benchmark.BenchmarkMetadata):
|
| + def __init__(self):
|
| + super(EmptyMetadataForTest, self).__init__('')
|
| +
|
| class PageMeasurementUnitTestBase(unittest.TestCase):
|
| """unittest.TestCase-derived class to help in the construction of unit tests
|
| for a measurement."""
|
| @@ -63,7 +69,9 @@ class PageMeasurementUnitTestBase(unittest.TestCase):
|
| options.output_trace_tag = None
|
| page_runner.ProcessCommandLineArgs(temp_parser, options)
|
| measurement.ProcessCommandLineArgs(temp_parser, options)
|
| - return page_runner.Run(measurement, ps, expectations, options)
|
| + results = results_options.CreateResults(EmptyMetadataForTest(), options)
|
| + page_runner.Run(measurement, ps, expectations, options, results)
|
| + return results
|
|
|
| def TestTracingCleanedUp(self, measurement_class, options=None):
|
| ps = self.CreatePageSetFromFileInUnittestDataDir('blank.html')
|
|
|