| 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 logging | 5 import logging |
| 6 import os | 6 import os |
| 7 import unittest | 7 import unittest |
| 8 | 8 |
| 9 from telemetry import test | 9 from telemetry import test |
| 10 from telemetry.core import discover | 10 from telemetry.core import discover |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 benchmark.AddCommandLineArgs(parser) | 64 benchmark.AddCommandLineArgs(parser) |
| 65 test.AddCommandLineArgs(parser) | 65 test.AddCommandLineArgs(parser) |
| 66 benchmark.SetArgumentDefaults(parser) | 66 benchmark.SetArgumentDefaults(parser) |
| 67 options.MergeDefaultValues(parser.get_default_values()) | 67 options.MergeDefaultValues(parser.get_default_values()) |
| 68 | 68 |
| 69 benchmark.ProcessCommandLineArgs(None, options) | 69 benchmark.ProcessCommandLineArgs(None, options) |
| 70 test.ProcessCommandLineArgs(None, options) | 70 test.ProcessCommandLineArgs(None, options) |
| 71 | 71 |
| 72 self.assertEqual(0, SinglePageBenchmark().Run(options), | 72 self.assertEqual(0, SinglePageBenchmark().Run(options), |
| 73 msg='Failed: %s' % benchmark) | 73 msg='Failed: %s' % benchmark) |
| OLD | NEW |