| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import unittest | 5 import unittest |
| 6 | 6 |
| 7 from telemetry import benchmark | 7 from telemetry import benchmark |
| 8 from telemetry.core import exceptions | 8 from telemetry.core import exceptions |
| 9 from telemetry.core import util | 9 from telemetry.core import util |
| 10 from telemetry.page import page_runner | 10 from telemetry.page import page_runner |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 measurement.SetArgumentDefaults(temp_parser) | 59 measurement.SetArgumentDefaults(temp_parser) |
| 60 defaults = temp_parser.get_default_values() | 60 defaults = temp_parser.get_default_values() |
| 61 for k, v in defaults.__dict__.items(): | 61 for k, v in defaults.__dict__.items(): |
| 62 if hasattr(options, k): | 62 if hasattr(options, k): |
| 63 continue | 63 continue |
| 64 setattr(options, k, v) | 64 setattr(options, k, v) |
| 65 | 65 |
| 66 measurement.CustomizeBrowserOptions(options.browser_options) | 66 measurement.CustomizeBrowserOptions(options.browser_options) |
| 67 options.output_file = None | 67 options.output_file = None |
| 68 options.output_format = 'none' | 68 options.output_format = 'none' |
| 69 options.suppress_gtest_report = True |
| 69 options.output_trace_tag = None | 70 options.output_trace_tag = None |
| 70 page_runner.ProcessCommandLineArgs(temp_parser, options) | 71 page_runner.ProcessCommandLineArgs(temp_parser, options) |
| 71 measurement.ProcessCommandLineArgs(temp_parser, options) | 72 measurement.ProcessCommandLineArgs(temp_parser, options) |
| 72 results = results_options.CreateResults(EmptyMetadataForTest(), options) | 73 results = results_options.CreateResults(EmptyMetadataForTest(), options) |
| 73 page_runner.Run(measurement, ps, expectations, options, results) | 74 page_runner.Run(measurement, ps, expectations, options, results) |
| 74 return results | 75 return results |
| 75 | 76 |
| 76 def TestTracingCleanedUp(self, measurement_class, options=None): | 77 def TestTracingCleanedUp(self, measurement_class, options=None): |
| 77 ps = self.CreatePageSetFromFileInUnittestDataDir('blank.html') | 78 ps = self.CreatePageSetFromFileInUnittestDataDir('blank.html') |
| 78 start_tracing_called = [False] | 79 start_tracing_called = [False] |
| (...skipping 20 matching lines...) Expand all Loading... |
| 99 | 100 |
| 100 return measurement_class.TabForPage(self, page, browser) | 101 return measurement_class.TabForPage(self, page, browser) |
| 101 | 102 |
| 102 measurement = BuggyMeasurement() | 103 measurement = BuggyMeasurement() |
| 103 try: | 104 try: |
| 104 self.RunMeasurement(measurement, ps, options=options) | 105 self.RunMeasurement(measurement, ps, options=options) |
| 105 except page_test.TestNotSupportedOnPlatformFailure: | 106 except page_test.TestNotSupportedOnPlatformFailure: |
| 106 pass | 107 pass |
| 107 if start_tracing_called[0]: | 108 if start_tracing_called[0]: |
| 108 self.assertTrue(stop_tracing_called[0]) | 109 self.assertTrue(stop_tracing_called[0]) |
| OLD | NEW |