Index: content/test/gpu/gpu_tests/gpu_test_base_unittest.py |
diff --git a/content/test/gpu/gpu_tests/gpu_test_base_unittest.py b/content/test/gpu/gpu_tests/gpu_test_base_unittest.py |
index 7001f6f5dd53b5368d578d030b344051dae68972..ae36bf0d77880a969afdad271f36fb3cfdd71438 100644 |
--- a/content/test/gpu/gpu_tests/gpu_test_base_unittest.py |
+++ b/content/test/gpu/gpu_tests/gpu_test_base_unittest.py |
@@ -1,18 +1,16 @@ |
# Copyright 2015 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 os |
import unittest |
-from telemetry import benchmark |
+from telemetry import benchmark as telemetry_benchmark |
Ken Russell (switch to Gerrit)
2015/10/21 22:12:08
This seems fine, or also consider "benchmark_modul
Corentin Wallez
2015/10/21 23:07:25
Done.
|
from telemetry.core import exceptions |
-from telemetry.core import util |
from telemetry.story import story_set as story_set_module |
from telemetry.testing import fakes |
import mock # pylint: disable=import-error |
-import gpu_test_base |
+from gpu_tests import gpu_test_base |
# Unit tests verifying invariants of classes in GpuTestBase. |
@@ -163,10 +161,10 @@ class PageExecutionTest(unittest.TestCase): |
finder_options.upload_results = False |
testclass = FakeTest |
parser = finder_options.CreateParser() |
- benchmark.AddCommandLineArgs(parser) |
+ telemetry_benchmark.AddCommandLineArgs(parser) |
testclass.AddCommandLineArgs(parser) |
options, dummy_args = parser.parse_args([]) |
- benchmark.ProcessCommandLineArgs(parser, options) |
+ telemetry_benchmark.ProcessCommandLineArgs(parser, options) |
testclass.ProcessCommandLineArgs(parser, options) |
test = testclass(times_to_fail_test=num_test_failures, |
manager_mock=manager_mock) |