diff options
42 files changed, 53 insertions, 50 deletions
diff --git a/chrome/test/telemetry/chromeos/login_unittest.py b/chrome/test/telemetry/chromeos/login_unittest.py index 3b3e578..6e21c38 100644 --- a/chrome/test/telemetry/chromeos/login_unittest.py +++ b/chrome/test/telemetry/chromeos/login_unittest.py @@ -7,10 +7,10 @@ import os import unittest from telemetry.core.backends.chrome import cros_interface -from telemetry.core import browser_finder from telemetry.core import exceptions from telemetry.core import extension_to_load from telemetry.core import util +from telemetry.internal.browser import browser_finder from telemetry.unittest import options_for_unittests class CrOSAutoTest(unittest.TestCase): diff --git a/content/test/gpu/gpu_tests/webgl_conformance.py b/content/test/gpu/gpu_tests/webgl_conformance.py index ee95977..eab3885 100644 --- a/content/test/gpu/gpu_tests/webgl_conformance.py +++ b/content/test/gpu/gpu_tests/webgl_conformance.py @@ -9,8 +9,8 @@ import sys import webgl_conformance_expectations from telemetry import benchmark as benchmark_module -from telemetry.core import browser_finder from telemetry.core import util +from telemetry.internal.browser import browser_finder from telemetry.page import page as page_module from telemetry.page import page_test from telemetry.page import shared_page_state diff --git a/tools/perf/benchmarks/benchmark_unittest.py b/tools/perf/benchmarks/benchmark_unittest.py index e42179e..872f710 100644 --- a/tools/perf/benchmarks/benchmark_unittest.py +++ b/tools/perf/benchmarks/benchmark_unittest.py @@ -11,8 +11,8 @@ import unittest from core import perf_benchmark from telemetry import benchmark as benchmark_module -from telemetry.core import browser_options from telemetry.core import discover +from telemetry.internal.browser import browser_options from telemetry.unittest_util import progress_reporter diff --git a/tools/perf/core/perf_benchmark.py b/tools/perf/core/perf_benchmark.py index 6c15175..461b16f 100644 --- a/tools/perf/core/perf_benchmark.py +++ b/tools/perf/core/perf_benchmark.py @@ -6,7 +6,7 @@ import os import sys from telemetry import benchmark -from telemetry.core import browser_finder +from telemetry.internal.browser import browser_finder sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, 'variations')) diff --git a/tools/perf/measurements/measurement_smoke_test.py b/tools/perf/measurements/measurement_smoke_test.py index 333e1fa..9c8d741 100644 --- a/tools/perf/measurements/measurement_smoke_test.py +++ b/tools/perf/measurements/measurement_smoke_test.py @@ -8,8 +8,8 @@ import os import unittest from telemetry import benchmark as benchmark_module -from telemetry.core import browser_options from telemetry.core import discover +from telemetry.internal.browser import browser_options from telemetry.page import page_test from telemetry.unittest_util import options_for_unittests from telemetry.web_perf import timeline_based_measurement diff --git a/tools/perf/measurements/page_cycler_unittest.py b/tools/perf/measurements/page_cycler_unittest.py index a570a64..a3b00fc 100644 --- a/tools/perf/measurements/page_cycler_unittest.py +++ b/tools/perf/measurements/page_cycler_unittest.py @@ -5,7 +5,7 @@ import sys import unittest -from telemetry.core import browser_options +from telemetry.internal.browser import browser_options from telemetry.internal.results import page_test_results from telemetry.internal import story_runner from telemetry.unittest_util import simple_mock diff --git a/tools/perf/profile_creators/profile_extender.py b/tools/perf/profile_creators/profile_extender.py index b1dccfa6..08d3a46 100644 --- a/tools/perf/profile_creators/profile_extender.py +++ b/tools/perf/profile_creators/profile_extender.py @@ -2,10 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -from telemetry.core import browser_finder -from telemetry.core import browser_finder_exceptions from telemetry.core import platform from telemetry.core import wpr_modes +from telemetry.internal.browser import browser_finder +from telemetry.internal.browser import browser_finder_exceptions class ProfileExtender(object): diff --git a/tools/perf/profile_creators/profile_generator.py b/tools/perf/profile_creators/profile_generator.py index 7636568..4c52665 100644 --- a/tools/perf/profile_creators/profile_generator.py +++ b/tools/perf/profile_creators/profile_generator.py @@ -13,10 +13,10 @@ import sys import tempfile from profile_creators import profile_extender -from telemetry.core import browser_finder -from telemetry.core import browser_options from telemetry.core import discover from telemetry.core import util +from telemetry.internal.browser import browser_finder +from telemetry.internal.browser import browser_options from telemetry.internal import story_runner diff --git a/tools/perf/record_android_profile.py b/tools/perf/record_android_profile.py index b9e63eb..41d99a7 100755 --- a/tools/perf/record_android_profile.py +++ b/tools/perf/record_android_profile.py @@ -9,8 +9,8 @@ import tempfile sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry')) -from telemetry.core import browser_finder -from telemetry.core import browser_options +from telemetry.internal.browser import browser_finder +from telemetry.internal.browser import browser_options def _RunPrebuilt(options): diff --git a/tools/telemetry/experimental/telemetry_perf_test.py b/tools/telemetry/experimental/telemetry_perf_test.py index a23d1c9..81f6d24 100755 --- a/tools/telemetry/experimental/telemetry_perf_test.py +++ b/tools/telemetry/experimental/telemetry_perf_test.py @@ -9,8 +9,8 @@ import time sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir)) -from telemetry.core import browser_finder -from telemetry.core import browser_options +from telemetry.internal.browser import browser_finder +from telemetry.internal.browser import browser_options def Main(args): diff --git a/tools/telemetry/telemetry/benchmark_runner.py b/tools/telemetry/telemetry/benchmark_runner.py index 53ec272..cdce3eb 100644 --- a/tools/telemetry/telemetry/benchmark_runner.py +++ b/tools/telemetry/telemetry/benchmark_runner.py @@ -15,11 +15,11 @@ import os import sys from telemetry import benchmark -from telemetry.core import browser_finder -from telemetry.core import browser_options from telemetry.core import command_line from telemetry.core import discover from telemetry import decorators +from telemetry.internal.browser import browser_finder +from telemetry.internal.browser import browser_options def PrintBenchmarkList(benchmarks, possible_browser, output_pipe=sys.stdout): diff --git a/tools/telemetry/telemetry/benchmark_unittest.py b/tools/telemetry/telemetry/benchmark_unittest.py index 77e5b572..2c3ca69 100644 --- a/tools/telemetry/telemetry/benchmark_unittest.py +++ b/tools/telemetry/telemetry/benchmark_unittest.py @@ -7,7 +7,7 @@ import unittest from telemetry import android from telemetry import benchmark -from telemetry.core import browser_options +from telemetry.internal.browser import browser_options from telemetry.internal import story_runner from telemetry import page from telemetry.page import page_test diff --git a/tools/telemetry/telemetry/core/extension_unittest.py b/tools/telemetry/telemetry/core/extension_unittest.py index 2092b04..afed6d1 100644 --- a/tools/telemetry/telemetry/core/extension_unittest.py +++ b/tools/telemetry/telemetry/core/extension_unittest.py @@ -8,9 +8,9 @@ import shutil import tempfile import unittest -from telemetry.core import browser_finder from telemetry.core import extension_to_load from telemetry.core import util +from telemetry.internal.browser import browser_finder from telemetry.unittest_util import options_for_unittests diff --git a/tools/telemetry/telemetry/core/platform/android_device_unittest.py b/tools/telemetry/telemetry/core/platform/android_device_unittest.py index b8a61dd..efeda96 100644 --- a/tools/telemetry/telemetry/core/platform/android_device_unittest.py +++ b/tools/telemetry/telemetry/core/platform/android_device_unittest.py @@ -4,9 +4,9 @@ import unittest -from telemetry.core import browser_options from telemetry.core.platform import android_device from telemetry.core.platform import android_platform_backend +from telemetry.internal.browser import browser_options from telemetry.unittest_util import system_stub diff --git a/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py index a4e5981..5b686e9 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py @@ -7,7 +7,6 @@ import logging import os -from telemetry.core import browser from telemetry.core import exceptions from telemetry.core import platform from telemetry.core.platform import android_device @@ -16,6 +15,7 @@ from telemetry.core import util from telemetry import decorators from telemetry.internal.backends import android_browser_backend_settings from telemetry.internal.backends.chrome import android_browser_backend +from telemetry.internal.browser import browser util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') from pylib.utils import apk_helper # pylint: disable=import-error diff --git a/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder_unittest.py index 6f44e30..366b397 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder_unittest.py @@ -4,9 +4,9 @@ import unittest -from telemetry.core import browser_options from telemetry.core import util from telemetry.internal.backends.chrome import android_browser_finder +from telemetry.internal.browser import browser_options from telemetry.unittest_util import system_stub util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock') diff --git a/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py index 62f4e47..245f9bc 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py @@ -6,14 +6,14 @@ import logging -from telemetry.core import browser -from telemetry.core import browser_finder_exceptions from telemetry.core import platform as platform_module from telemetry.core.platform import cros_device from telemetry.core.platform import cros_interface from telemetry.core import possible_browser from telemetry.internal.backends.chrome import cros_browser_backend from telemetry.internal.backends.chrome import cros_browser_with_oobe +from telemetry.internal.browser import browser +from telemetry.internal.browser import browser_finder_exceptions class PossibleCrOSBrowser(possible_browser.PossibleBrowser): diff --git a/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_with_oobe.py b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_with_oobe.py index 39f8fea..127a180 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_with_oobe.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_with_oobe.py @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -from telemetry.core import browser from telemetry.internal.backends.chrome import cros_browser_backend +from telemetry.internal.browser import browser class CrOSBrowserWithOOBE(browser.Browser): diff --git a/tools/telemetry/telemetry/internal/backends/chrome/cros_test_case.py b/tools/telemetry/telemetry/internal/backends/chrome/cros_test_case.py index b2564c4..8528c60 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/cros_test_case.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/cros_test_case.py @@ -5,10 +5,10 @@ import os import unittest -from telemetry.core import browser_finder from telemetry.core import extension_to_load from telemetry.core.platform import cros_interface from telemetry.core import util +from telemetry.internal.browser import browser_finder from telemetry.unittest_util import options_for_unittests diff --git a/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py index 55802e8..39ed5ea 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py @@ -8,12 +8,12 @@ import os import subprocess import sys -from telemetry.core import browser from telemetry.core import exceptions from telemetry.core import platform as platform_module from telemetry.core.platform import desktop_device from telemetry.core import possible_browser from telemetry.internal.backends.chrome import desktop_browser_backend +from telemetry.internal.browser import browser from telemetry.internal.util import path diff --git a/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder_unittest.py index 38f69f9..05422c8 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder_unittest.py @@ -3,9 +3,9 @@ # found in the LICENSE file. import unittest -from telemetry.core import browser_options from telemetry.core.platform import desktop_device from telemetry.internal.backends.chrome import desktop_browser_finder +from telemetry.internal.browser import browser_options from telemetry.unittest_util import system_stub diff --git a/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder.py b/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder.py index ac4cc2f..9138c4c 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder.py @@ -7,13 +7,13 @@ import logging import re -from telemetry.core import browser from telemetry.core import platform from telemetry.core.platform import ios_device from telemetry.core.platform import ios_platform_backend from telemetry.core import possible_browser from telemetry.internal.backends.chrome import ios_browser_backend from telemetry.internal.backends.chrome_inspector import inspector_backend +from telemetry.internal.browser import browser # Key matches output from ios-webkit-debug-proxy and the value is a readable diff --git a/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder_unittest.py index 8f2e93f..dcb4772 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder_unittest.py @@ -3,10 +3,10 @@ # found in the LICENSE file. import unittest -from telemetry.core import browser_options from telemetry.core.platform import ios_device from telemetry import decorators from telemetry.internal.backends.chrome import ios_browser_finder +from telemetry.internal.browser import browser_options class IosBrowserFinderUnitTest(unittest.TestCase): diff --git a/tools/telemetry/telemetry/internal/backends/form_based_credentials_backend_unittest_base.py b/tools/telemetry/telemetry/internal/backends/form_based_credentials_backend_unittest_base.py index a2b3e2a..8b24d43 100644 --- a/tools/telemetry/telemetry/internal/backends/form_based_credentials_backend_unittest_base.py +++ b/tools/telemetry/telemetry/internal/backends/form_based_credentials_backend_unittest_base.py @@ -7,8 +7,8 @@ import os import unittest from telemetry import benchmark -from telemetry.core import browser_finder from telemetry.core import util +from telemetry.internal.browser import browser_finder from telemetry.unittest_util import options_for_unittests from telemetry.unittest_util import simple_mock diff --git a/tools/telemetry/telemetry/internal/backends/mandoline/desktop_mandoline_finder.py b/tools/telemetry/telemetry/internal/backends/mandoline/desktop_mandoline_finder.py index 33a2a1f..1e8ee36 100644 --- a/tools/telemetry/telemetry/internal/backends/mandoline/desktop_mandoline_finder.py +++ b/tools/telemetry/telemetry/internal/backends/mandoline/desktop_mandoline_finder.py @@ -6,12 +6,12 @@ import os import sys -from telemetry.core import browser from telemetry.core import exceptions from telemetry.core import platform as platform_module from telemetry.core.platform import desktop_device from telemetry.core import possible_browser from telemetry.internal.backends.mandoline import desktop_mandoline_backend +from telemetry.internal.browser import browser from telemetry.internal.util import path diff --git a/tools/telemetry/telemetry/internal/backends/remote/trybot_browser_finder_unittest.py b/tools/telemetry/telemetry/internal/backends/remote/trybot_browser_finder_unittest.py index 5a81fb4..0e7225e 100644 --- a/tools/telemetry/telemetry/internal/backends/remote/trybot_browser_finder_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/remote/trybot_browser_finder_unittest.py @@ -7,8 +7,8 @@ import logging import StringIO import unittest -from telemetry.core import browser_options from telemetry.internal.backends.remote import trybot_browser_finder +from telemetry.internal.browser import browser_options from telemetry.unittest_util import simple_mock from telemetry.unittest_util import system_stub diff --git a/tools/telemetry/telemetry/internal/browser/__init__.py b/tools/telemetry/telemetry/internal/browser/__init__.py new file mode 100644 index 0000000..50b23df --- /dev/null +++ b/tools/telemetry/telemetry/internal/browser/__init__.py @@ -0,0 +1,3 @@ +# 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. diff --git a/tools/telemetry/telemetry/core/browser.py b/tools/telemetry/telemetry/internal/browser/browser.py index aa10ede..cd24b56 100644 --- a/tools/telemetry/telemetry/core/browser.py +++ b/tools/telemetry/telemetry/internal/browser/browser.py @@ -5,7 +5,6 @@ import os from telemetry.core import app -from telemetry.core import browser_credentials from telemetry.core import exceptions from telemetry.core import extension_dict from telemetry.core import local_server @@ -14,6 +13,7 @@ from telemetry.core.platform import profiling_controller from telemetry.core import tab_list from telemetry import decorators from telemetry.internal.backends import browser_backend +from telemetry.internal.browser import browser_credentials class Browser(app.App): diff --git a/tools/telemetry/telemetry/core/browser_credentials.py b/tools/telemetry/telemetry/internal/browser/browser_credentials.py index 4d17edc..4d17edc 100644 --- a/tools/telemetry/telemetry/core/browser_credentials.py +++ b/tools/telemetry/telemetry/internal/browser/browser_credentials.py diff --git a/tools/telemetry/telemetry/core/browser_credentials_unittest.py b/tools/telemetry/telemetry/internal/browser/browser_credentials_unittest.py index fd79ac8..b172554 100644 --- a/tools/telemetry/telemetry/core/browser_credentials_unittest.py +++ b/tools/telemetry/telemetry/internal/browser/browser_credentials_unittest.py @@ -5,7 +5,7 @@ import os import tempfile import unittest -from telemetry.core import browser_credentials +from telemetry.internal.browser import browser_credentials SIMPLE_CREDENTIALS_STRING = """ diff --git a/tools/telemetry/telemetry/core/browser_finder.py b/tools/telemetry/telemetry/internal/browser/browser_finder.py index b57dcfb..aab1495 100644 --- a/tools/telemetry/telemetry/core/browser_finder.py +++ b/tools/telemetry/telemetry/internal/browser/browser_finder.py @@ -7,7 +7,6 @@ import logging import operator -from telemetry.core import browser_finder_exceptions from telemetry.core import device_finder from telemetry import decorators from telemetry.internal.backends.chrome import android_browser_finder @@ -16,6 +15,7 @@ from telemetry.internal.backends.chrome import desktop_browser_finder from telemetry.internal.backends.chrome import ios_browser_finder from telemetry.internal.backends.mandoline import desktop_mandoline_finder from telemetry.internal.backends.remote import trybot_browser_finder +from telemetry.internal.browser import browser_finder_exceptions BROWSER_FINDERS = [ desktop_browser_finder, diff --git a/tools/telemetry/telemetry/core/browser_finder_exceptions.py b/tools/telemetry/telemetry/internal/browser/browser_finder_exceptions.py index 76fbdcf..76fbdcf 100644 --- a/tools/telemetry/telemetry/core/browser_finder_exceptions.py +++ b/tools/telemetry/telemetry/internal/browser/browser_finder_exceptions.py diff --git a/tools/telemetry/telemetry/core/browser_info.py b/tools/telemetry/telemetry/internal/browser/browser_info.py index 94cb1543..94cb1543 100644 --- a/tools/telemetry/telemetry/core/browser_info.py +++ b/tools/telemetry/telemetry/internal/browser/browser_info.py diff --git a/tools/telemetry/telemetry/core/browser_options.py b/tools/telemetry/telemetry/internal/browser/browser_options.py index d183e9b4..c5957ae 100644 --- a/tools/telemetry/telemetry/core/browser_options.py +++ b/tools/telemetry/telemetry/internal/browser/browser_options.py @@ -10,14 +10,14 @@ import shlex import socket import sys -from telemetry.core import browser_finder -from telemetry.core import browser_finder_exceptions from telemetry.core import device_finder from telemetry.core import platform from telemetry.core.platform.profiler import profiler_finder from telemetry.core import profile_types from telemetry.core import util from telemetry.core import wpr_modes +from telemetry.internal.browser import browser_finder +from telemetry.internal.browser import browser_finder_exceptions util.AddDirToPythonPath( util.GetChromiumSrcDir(), 'third_party', 'webpagereplay') diff --git a/tools/telemetry/telemetry/core/browser_options_unittest.py b/tools/telemetry/telemetry/internal/browser/browser_options_unittest.py index 6aa5620..61f12dd 100644 --- a/tools/telemetry/telemetry/core/browser_options_unittest.py +++ b/tools/telemetry/telemetry/internal/browser/browser_options_unittest.py @@ -5,7 +5,7 @@ import optparse import os import unittest -from telemetry.core import browser_options +from telemetry.internal.browser import browser_options class BrowserOptionsTest(unittest.TestCase): diff --git a/tools/telemetry/telemetry/core/browser_unittest.py b/tools/telemetry/telemetry/internal/browser/browser_unittest.py index 47bacc1..22a0502 100644 --- a/tools/telemetry/telemetry/core/browser_unittest.py +++ b/tools/telemetry/telemetry/internal/browser/browser_unittest.py @@ -8,7 +8,6 @@ import shutil import tempfile import unittest -from telemetry.core import browser_finder from telemetry.core import gpu_device from telemetry.core import gpu_info from telemetry.core.platform import tracing_category_filter @@ -16,6 +15,7 @@ from telemetry.core.platform import tracing_options from telemetry.core import system_info from telemetry.core import util from telemetry import decorators +from telemetry.internal.browser import browser_finder from telemetry.internal.util import path from telemetry.unittest_util import browser_test_case from telemetry.unittest_util import options_for_unittests diff --git a/tools/telemetry/telemetry/page/page_run_end_to_end_unittest.py b/tools/telemetry/telemetry/page/page_run_end_to_end_unittest.py index 5424e1e..d45484e 100644 --- a/tools/telemetry/telemetry/page/page_run_end_to_end_unittest.py +++ b/tools/telemetry/telemetry/page/page_run_end_to_end_unittest.py @@ -11,11 +11,11 @@ import tempfile import unittest from telemetry import benchmark -from telemetry.core import browser_finder from telemetry.core import exceptions from telemetry.core import user_agent from telemetry.core import util from telemetry import decorators +from telemetry.internal.browser import browser_finder from telemetry.internal.results import results_options from telemetry.internal import story_runner from telemetry.internal.util import exception_formatter diff --git a/tools/telemetry/telemetry/page/shared_page_state.py b/tools/telemetry/telemetry/page/shared_page_state.py index 5d1a705..85666d7 100644 --- a/tools/telemetry/telemetry/page/shared_page_state.py +++ b/tools/telemetry/telemetry/page/shared_page_state.py @@ -8,19 +8,19 @@ import sys import zipfile from catapult_base import cloud_storage -from telemetry.core import browser_finder -from telemetry.core import browser_finder_exceptions -from telemetry.core import browser_info as browser_info_module from telemetry.core import exceptions from telemetry.core.platform.profiler import profiler_finder from telemetry.core import util from telemetry.core import wpr_modes from telemetry import decorators -from telemetry import story +from telemetry.internal.browser import browser_finder +from telemetry.internal.browser import browser_finder_exceptions +from telemetry.internal.browser import browser_info as browser_info_module from telemetry.internal.util import exception_formatter from telemetry.internal.util import file_handle from telemetry.page import action_runner as action_runner_module from telemetry.page import page_test +from telemetry import story from telemetry.value import skip from telemetry.web_perf import timeline_based_measurement diff --git a/tools/telemetry/telemetry/record_wpr.py b/tools/telemetry/telemetry/record_wpr.py index 3e323e5..39038d5 100644 --- a/tools/telemetry/telemetry/record_wpr.py +++ b/tools/telemetry/telemetry/record_wpr.py @@ -7,10 +7,10 @@ import logging import sys from telemetry import benchmark -from telemetry.core import browser_options from telemetry.core import discover from telemetry.core import util from telemetry.core import wpr_modes +from telemetry.internal.browser import browser_options from telemetry.internal.results import results_options from telemetry.internal import story_runner from telemetry.page import page_set diff --git a/tools/telemetry/telemetry/unittest_util/browser_test_case.py b/tools/telemetry/telemetry/unittest_util/browser_test_case.py index 23ae086..210251a 100644 --- a/tools/telemetry/telemetry/unittest_util/browser_test_case.py +++ b/tools/telemetry/telemetry/unittest_util/browser_test_case.py @@ -5,7 +5,7 @@ import os import unittest -from telemetry.core import browser_finder +from telemetry.internal.browser import browser_finder from telemetry.internal.util import path from telemetry.unittest_util import options_for_unittests diff --git a/tools/telemetry/telemetry/unittest_util/run_tests.py b/tools/telemetry/telemetry/unittest_util/run_tests.py index e03d163..37952ff 100644 --- a/tools/telemetry/telemetry/unittest_util/run_tests.py +++ b/tools/telemetry/telemetry/unittest_util/run_tests.py @@ -3,13 +3,13 @@ # found in the LICENSE file. import sys -from telemetry.core import browser_finder -from telemetry.core import browser_finder_exceptions -from telemetry.core import browser_options from telemetry.core import command_line from telemetry.core import device_finder from telemetry.core import util from telemetry import decorators +from telemetry.internal.browser import browser_finder +from telemetry.internal.browser import browser_finder_exceptions +from telemetry.internal.browser import browser_options from telemetry.unittest_util import browser_test_case from telemetry.unittest_util import options_for_unittests diff --git a/tools/telemetry/telemetry/unittest_util/story_set_smoke_test.py b/tools/telemetry/telemetry/unittest_util/story_set_smoke_test.py index 788567c..35065ee 100644 --- a/tools/telemetry/telemetry/unittest_util/story_set_smoke_test.py +++ b/tools/telemetry/telemetry/unittest_util/story_set_smoke_test.py @@ -6,8 +6,8 @@ import logging import os import unittest -from telemetry.core import browser_credentials from telemetry.core import discover +from telemetry.internal.browser import browser_credentials from telemetry import page from telemetry import story as story_module from telemetry.wpr import archive_info |