diff --git a/content/test/gpu/page_sets/page_set_unittest.py b/content/test/gpu/page_sets/page_set_unittest.py index 79f37dd7154932..f10d80d0f6a308 100644 --- a/content/test/gpu/page_sets/page_set_unittest.py +++ b/content/test/gpu/page_sets/page_set_unittest.py @@ -4,7 +4,7 @@ import os -from telemetry.unittest_util import story_set_smoke_test +from telemetry.testing import story_set_smoke_test class StorySetUnitTest(story_set_smoke_test.StorySetSmokeTest): diff --git a/content/test/gpu/run_unittests.py b/content/test/gpu/run_unittests.py index 21c901ee3b7bff..ea5461e28fd9cd 100755 --- a/content/test/gpu/run_unittests.py +++ b/content/test/gpu/run_unittests.py @@ -24,7 +24,7 @@ else: env['PYTHONPATH'] = telemetry_dir - path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'unittest_util', + path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'testing', 'run_tests.py') argv = ['--top-level-dir', gpu_test_dir] + sys.argv[1:] sys.exit(subprocess.call([sys.executable, path_to_run_tests] + argv, env=env)) diff --git a/tools/chrome_proxy/common/network_metrics_unittest.py b/tools/chrome_proxy/common/network_metrics_unittest.py index c40e5269928f73..fe1e48f035ffee 100644 --- a/tools/chrome_proxy/common/network_metrics_unittest.py +++ b/tools/chrome_proxy/common/network_metrics_unittest.py @@ -6,8 +6,8 @@ import unittest from common import network_metrics +from telemetry.testing import test_page_test_results from telemetry.timeline import event -from telemetry.unittest_util import test_page_test_results HTML_BODY = """ diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_metrics_unittest.py b/tools/chrome_proxy/integration_tests/chrome_proxy_metrics_unittest.py index 0f61619e88ce85..3b2240bd9ce2ab 100644 --- a/tools/chrome_proxy/integration_tests/chrome_proxy_metrics_unittest.py +++ b/tools/chrome_proxy/integration_tests/chrome_proxy_metrics_unittest.py @@ -8,7 +8,7 @@ from common import chrome_proxy_metrics as common_metrics from common import network_metrics_unittest as network_unittest from integration_tests import chrome_proxy_metrics as metrics -from telemetry.unittest_util import test_page_test_results +from telemetry.testing import test_page_test_results TEST_EXTRA_VIA_HEADER = '1.1 EXTRA_VIA_HEADER' diff --git a/tools/chrome_proxy/live_tests/chrome_proxy_metrics_unittest.py b/tools/chrome_proxy/live_tests/chrome_proxy_metrics_unittest.py index c2e25711156a80..1bb9c4afb813a6 100644 --- a/tools/chrome_proxy/live_tests/chrome_proxy_metrics_unittest.py +++ b/tools/chrome_proxy/live_tests/chrome_proxy_metrics_unittest.py @@ -8,7 +8,7 @@ from common import chrome_proxy_metrics as common_metrics from common import network_metrics_unittest as network_unittest from live_tests import chrome_proxy_metrics as metrics -from telemetry.unittest_util import test_page_test_results +from telemetry.testing import test_page_test_results TEST_EXTRA_VIA_HEADER = '1.1 EXTRA_VIA_HEADER' diff --git a/tools/chrome_proxy/run_tests b/tools/chrome_proxy/run_tests index 11780b1aa2913c..aff7dcdf14f41c 100755 --- a/tools/chrome_proxy/run_tests +++ b/tools/chrome_proxy/run_tests @@ -24,7 +24,7 @@ if __name__ == '__main__': else: env['PYTHONPATH'] = telemetry_dir - path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'unittest_util', + path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'testing', 'run_tests.py') argv = ['--top-level-dir', proxy_dir, '--path', perf_dir] + sys.argv[1:] sys.exit(subprocess.call([sys.executable, path_to_run_tests] + argv, env=env)) diff --git a/tools/perf/benchmarks/benchmark_smoke_unittest.py b/tools/perf/benchmarks/benchmark_smoke_unittest.py index 926d36732b938f..4acd33222bc2aa 100644 --- a/tools/perf/benchmarks/benchmark_smoke_unittest.py +++ b/tools/perf/benchmarks/benchmark_smoke_unittest.py @@ -15,8 +15,8 @@ from telemetry import benchmark as benchmark_module from telemetry.core import discover -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import progress_reporter +from telemetry.testing import options_for_unittests +from telemetry.testing import progress_reporter from benchmarks import image_decoding from benchmarks import indexeddb_perf diff --git a/tools/perf/benchmarks/benchmark_unittest.py b/tools/perf/benchmarks/benchmark_unittest.py index 872f7106507757..9fe848d1a1857b 100644 --- a/tools/perf/benchmarks/benchmark_unittest.py +++ b/tools/perf/benchmarks/benchmark_unittest.py @@ -13,7 +13,7 @@ from telemetry import benchmark as benchmark_module from telemetry.core import discover from telemetry.internal.browser import browser_options -from telemetry.unittest_util import progress_reporter +from telemetry.testing import progress_reporter def _GetPerfDir(*subdirs): diff --git a/tools/perf/measurements/blink_style_unittest.py b/tools/perf/measurements/blink_style_unittest.py index ed79050f19ec87..b9c246a2840a23 100644 --- a/tools/perf/measurements/blink_style_unittest.py +++ b/tools/perf/measurements/blink_style_unittest.py @@ -5,8 +5,8 @@ from measurements import blink_style from telemetry import decorators -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case class BlinkStyleTest(page_test_test_case.PageTestTestCase): diff --git a/tools/perf/measurements/measurement_smoke_test.py b/tools/perf/measurements/measurement_smoke_test.py index 9c8d741f01488c..bedd0ba05582bb 100644 --- a/tools/perf/measurements/measurement_smoke_test.py +++ b/tools/perf/measurements/measurement_smoke_test.py @@ -11,7 +11,7 @@ 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.testing import options_for_unittests from telemetry.web_perf import timeline_based_measurement diff --git a/tools/perf/measurements/oilpan_gc_times_unittest.py b/tools/perf/measurements/oilpan_gc_times_unittest.py index f688dd4e02ce3b..3a8f051aa05af7 100644 --- a/tools/perf/measurements/oilpan_gc_times_unittest.py +++ b/tools/perf/measurements/oilpan_gc_times_unittest.py @@ -7,10 +7,10 @@ from telemetry.core import util from telemetry.internal.results import page_test_results from telemetry.page import page as page_module +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case from telemetry.timeline import model from telemetry.timeline import slice as slice_data -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock') import mock # pylint: disable=import-error diff --git a/tools/perf/measurements/page_cycler_unittest.py b/tools/perf/measurements/page_cycler_unittest.py index a3b00fc99aa95c..78893ba3ea7c7c 100644 --- a/tools/perf/measurements/page_cycler_unittest.py +++ b/tools/perf/measurements/page_cycler_unittest.py @@ -8,7 +8,7 @@ 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 +from telemetry.testing import simple_mock from measurements import page_cycler from metrics import keychain_metric diff --git a/tools/perf/measurements/rasterize_and_record_micro_unittest.py b/tools/perf/measurements/rasterize_and_record_micro_unittest.py index 07ccdb91020f2f..f61a26acad3ed6 100644 --- a/tools/perf/measurements/rasterize_and_record_micro_unittest.py +++ b/tools/perf/measurements/rasterize_and_record_micro_unittest.py @@ -6,8 +6,8 @@ from telemetry import decorators from telemetry.page import page_test -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case from telemetry.util import wpr_modes from measurements import rasterize_and_record_micro diff --git a/tools/perf/measurements/repaint_unittest.py b/tools/perf/measurements/repaint_unittest.py index 3a06acee1fd860..bf5e4c75e22ab4 100644 --- a/tools/perf/measurements/repaint_unittest.py +++ b/tools/perf/measurements/repaint_unittest.py @@ -4,8 +4,8 @@ from telemetry import decorators from telemetry.page import page as page_module -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case from telemetry.util import wpr_modes from measurements import smoothness diff --git a/tools/perf/measurements/skpicture_printer_unittest.py b/tools/perf/measurements/skpicture_printer_unittest.py index 1df37110c41a7f..d06bbc73d5b663 100644 --- a/tools/perf/measurements/skpicture_printer_unittest.py +++ b/tools/perf/measurements/skpicture_printer_unittest.py @@ -6,8 +6,8 @@ import tempfile from telemetry import decorators -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case from measurements import skpicture_printer diff --git a/tools/perf/measurements/smoothness_unittest.py b/tools/perf/measurements/smoothness_unittest.py index 729f56898fbf89..dae3365c0d7a83 100644 --- a/tools/perf/measurements/smoothness_unittest.py +++ b/tools/perf/measurements/smoothness_unittest.py @@ -5,8 +5,8 @@ from telemetry import decorators from telemetry.page import page -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case from telemetry.util import wpr_modes from measurements import smoothness diff --git a/tools/perf/measurements/task_execution_time_unittest.py b/tools/perf/measurements/task_execution_time_unittest.py index 7036997bdb1431..fd0863ea4da54f 100644 --- a/tools/perf/measurements/task_execution_time_unittest.py +++ b/tools/perf/measurements/task_execution_time_unittest.py @@ -5,10 +5,10 @@ from telemetry import decorators from telemetry.internal.results import page_test_results from telemetry.page import page as page_module +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case from telemetry.timeline import model as model_module from telemetry.timeline import slice as slice_data -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case from telemetry.util import wpr_modes from measurements import task_execution_time diff --git a/tools/perf/measurements/thread_times_unittest.py b/tools/perf/measurements/thread_times_unittest.py index 7e7186c7d86dc2..ddf4c389e9d07a 100644 --- a/tools/perf/measurements/thread_times_unittest.py +++ b/tools/perf/measurements/thread_times_unittest.py @@ -4,8 +4,8 @@ from telemetry import decorators from telemetry.page import page -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case from telemetry.util import wpr_modes from measurements import thread_times diff --git a/tools/perf/measurements/v8_detached_context_age_in_gc_unittest.py b/tools/perf/measurements/v8_detached_context_age_in_gc_unittest.py index 6f25fb35b3abbe..1d9151acb43c07 100644 --- a/tools/perf/measurements/v8_detached_context_age_in_gc_unittest.py +++ b/tools/perf/measurements/v8_detached_context_age_in_gc_unittest.py @@ -4,8 +4,8 @@ from telemetry.internal.results import page_test_results from telemetry.page import page as page_module -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case from telemetry.util import wpr_modes from measurements import v8_detached_context_age_in_gc diff --git a/tools/perf/measurements/v8_gc_times_unittest.py b/tools/perf/measurements/v8_gc_times_unittest.py index 1aa5e46bf7cd37..b07d34917e4970 100644 --- a/tools/perf/measurements/v8_gc_times_unittest.py +++ b/tools/perf/measurements/v8_gc_times_unittest.py @@ -5,9 +5,9 @@ from telemetry import decorators from telemetry.internal.results import page_test_results from telemetry.page import page as page_module +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case from telemetry.timeline import model as model_module -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case from telemetry.util import wpr_modes from measurements import v8_gc_times diff --git a/tools/perf/metrics/timeline_unittest.py b/tools/perf/metrics/timeline_unittest.py index 098ceae99b3281..96e569255e781d 100644 --- a/tools/perf/metrics/timeline_unittest.py +++ b/tools/perf/metrics/timeline_unittest.py @@ -4,8 +4,8 @@ import unittest +from telemetry.testing import test_page_test_results from telemetry.timeline import model as model_module -from telemetry.unittest_util import test_page_test_results from telemetry.web_perf import timeline_interaction_record as tir_module from metrics import timeline diff --git a/tools/perf/metrics/webrtc_stats_unittest.py b/tools/perf/metrics/webrtc_stats_unittest.py index cedf5e55b5cb09..6b746cac966418 100644 --- a/tools/perf/metrics/webrtc_stats_unittest.py +++ b/tools/perf/metrics/webrtc_stats_unittest.py @@ -4,7 +4,7 @@ import unittest -from telemetry.unittest_util import simple_mock +from telemetry.testing import simple_mock from metrics import webrtc_stats diff --git a/tools/perf/page_sets/story_set_unittest.py b/tools/perf/page_sets/story_set_unittest.py index 33475db8840882..7911631221eaa5 100644 --- a/tools/perf/page_sets/story_set_unittest.py +++ b/tools/perf/page_sets/story_set_unittest.py @@ -5,7 +5,7 @@ import os from telemetry import decorators -from telemetry.unittest_util import story_set_smoke_test +from telemetry.testing import story_set_smoke_test class StorySetUnitTest(story_set_smoke_test.StorySetSmokeTest): diff --git a/tools/perf/profile_creators/fast_navigation_profile_extender_unittest.py b/tools/perf/profile_creators/fast_navigation_profile_extender_unittest.py index 86e6c81a82d446..c4991940e0d40c 100644 --- a/tools/perf/profile_creators/fast_navigation_profile_extender_unittest.py +++ b/tools/perf/profile_creators/fast_navigation_profile_extender_unittest.py @@ -6,7 +6,7 @@ from profile_creators.fast_navigation_profile_extender import ( FastNavigationProfileExtender) from telemetry.core import util -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock') import mock # pylint: disable=import-error diff --git a/tools/perf/profile_creators/history_profile_extender_unittest.py b/tools/perf/profile_creators/history_profile_extender_unittest.py index 022e95789478c2..6cd671199534d9 100644 --- a/tools/perf/profile_creators/history_profile_extender_unittest.py +++ b/tools/perf/profile_creators/history_profile_extender_unittest.py @@ -9,7 +9,7 @@ from profile_creators.history_profile_extender import HistoryProfileExtender from telemetry.core import util from telemetry import decorators -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock') import mock # pylint: disable=import-error diff --git a/tools/perf/run_tests b/tools/perf/run_tests index ee8355293cad04..52cb2ad4d31389 100755 --- a/tools/perf/run_tests +++ b/tools/perf/run_tests @@ -23,7 +23,7 @@ if __name__ == '__main__': else: env['PYTHONPATH'] = telemetry_dir - path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'unittest_util', + path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'testing', 'run_tests.py') argv = ['--top-level-dir', perf_dir] + sys.argv[1:] sys.exit(subprocess.call([sys.executable, path_to_run_tests] + argv, env=env)) diff --git a/tools/telemetry/catapult_base/cloud_storage_unittest.py b/tools/telemetry/catapult_base/cloud_storage_unittest.py index fb7452248ba175..780d94678a9cb1 100644 --- a/tools/telemetry/catapult_base/cloud_storage_unittest.py +++ b/tools/telemetry/catapult_base/cloud_storage_unittest.py @@ -6,7 +6,7 @@ import unittest from catapult_base import cloud_storage -from telemetry.unittest_util import system_stub +from telemetry.testing import system_stub def _FakeFindGsutil(): diff --git a/tools/telemetry/run_tests b/tools/telemetry/run_tests index e420b66f9240d2..dc050435a5f48d 100755 --- a/tools/telemetry/run_tests +++ b/tools/telemetry/run_tests @@ -17,7 +17,7 @@ if __name__ == '__main__': else: env['PYTHONPATH'] = telemetry_dir - path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'unittest_util', + path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'testing', 'run_tests.py') argv = ['--top-level-dir', telemetry_dir] + sys.argv[1:] sys.exit(subprocess.call([sys.executable, path_to_run_tests] + argv, env=env)) diff --git a/tools/telemetry/telemetry/benchmark_runner_unittest.py b/tools/telemetry/telemetry/benchmark_runner_unittest.py index e28dcc14dcd393..0e27aa70548c5f 100644 --- a/tools/telemetry/telemetry/benchmark_runner_unittest.py +++ b/tools/telemetry/telemetry/benchmark_runner_unittest.py @@ -6,7 +6,7 @@ from telemetry import benchmark from telemetry import benchmark_runner from telemetry.core import util -from telemetry.unittest_util import stream +from telemetry.testing import stream util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock') import mock # pylint: disable=F0401 diff --git a/tools/telemetry/telemetry/core/local_server_unittest.py b/tools/telemetry/telemetry/core/local_server_unittest.py index 9b8fb1be85144f..1b3b71291f8dfb 100644 --- a/tools/telemetry/telemetry/core/local_server_unittest.py +++ b/tools/telemetry/telemetry/core/local_server_unittest.py @@ -5,7 +5,7 @@ import SimpleHTTPServer from telemetry.core import local_server -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class SimpleLocalServerBackendRequestHandler( diff --git a/tools/telemetry/telemetry/core/memory_cache_http_server_unittest.py b/tools/telemetry/telemetry/core/memory_cache_http_server_unittest.py index 37361bd221b66d..64ce8bb9ddb47f 100644 --- a/tools/telemetry/telemetry/core/memory_cache_http_server_unittest.py +++ b/tools/telemetry/telemetry/core/memory_cache_http_server_unittest.py @@ -5,7 +5,7 @@ import os from telemetry.core import util -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class MemoryCacheHTTPServerTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/core/platform/android_device_unittest.py b/tools/telemetry/telemetry/core/platform/android_device_unittest.py index efeda96751a1b4..65cec8a4552765 100644 --- a/tools/telemetry/telemetry/core/platform/android_device_unittest.py +++ b/tools/telemetry/telemetry/core/platform/android_device_unittest.py @@ -7,7 +7,7 @@ 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 +from telemetry.testing import system_stub class AndroidDeviceTest(unittest.TestCase): diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py b/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py index 54601b3fb63e89..83ebcc9ce88f73 100644 --- a/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py +++ b/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py @@ -4,12 +4,12 @@ import unittest -from telemetry.core import util from telemetry.core.platform import android_device from telemetry.core.platform import android_platform_backend +from telemetry.core import util from telemetry import decorators -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import system_stub +from telemetry.testing import options_for_unittests +from telemetry.testing import system_stub util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock') import mock # pylint: disable=F0401 diff --git a/tools/telemetry/telemetry/core/platform/cros_interface_unittest.py b/tools/telemetry/telemetry/core/platform/cros_interface_unittest.py index f85929497ef64b..b8a476d997ea8b 100644 --- a/tools/telemetry/telemetry/core/platform/cros_interface_unittest.py +++ b/tools/telemetry/telemetry/core/platform/cros_interface_unittest.py @@ -14,7 +14,7 @@ from telemetry import decorators from telemetry.internal import forwarders from telemetry.internal.forwarders import cros_forwarder -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests class CrOSInterfaceTest(unittest.TestCase): diff --git a/tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor_unittest.py b/tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor_unittest.py index 0ca4d0513984db..a790e32f80a983 100644 --- a/tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor_unittest.py +++ b/tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor_unittest.py @@ -5,7 +5,7 @@ import unittest from telemetry.core.platform.power_monitor import android_temperature_monitor -from telemetry.unittest_util import simple_mock +from telemetry.testing import simple_mock _ = simple_mock.DONT_CARE diff --git a/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py b/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py index cbdc898f6a359a..dbf71eefe7703b 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py +++ b/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py @@ -12,8 +12,8 @@ from telemetry.core.platform.profiler import android_profiling_helper from telemetry.core import util from telemetry import decorators -from telemetry.unittest_util import simple_mock -from telemetry.unittest_util import tab_test_case +from telemetry.testing import simple_mock +from telemetry.testing import tab_test_case def _GetLibrariesMappedIntoProcesses(device, pids): diff --git a/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler_unittest.py b/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler_unittest.py index e2249f3292c597..baa803a9e6f43e 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler_unittest.py +++ b/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler_unittest.py @@ -8,7 +8,7 @@ from telemetry.core.platform.profiler import android_systrace_profiler from telemetry import decorators -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class TestAndroidSystraceProfiler(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/core/platform/profiler/perf_profiler_unittest.py b/tools/telemetry/telemetry/core/platform/profiler/perf_profiler_unittest.py index ed0b4fce74f26a..c132e7b3ca5ca3 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/perf_profiler_unittest.py +++ b/tools/telemetry/telemetry/core/platform/profiler/perf_profiler_unittest.py @@ -7,8 +7,8 @@ from telemetry.core.platform.profiler import perf_profiler from telemetry.core import util -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import simple_mock +from telemetry.testing import options_for_unittests +from telemetry.testing import simple_mock class TestPerfProfiler(unittest.TestCase): diff --git a/tools/telemetry/telemetry/core/platform/profiler/trace_profiler_unittest.py b/tools/telemetry/telemetry/core/platform/profiler/trace_profiler_unittest.py index 2e27d7da1c26ea..df73fe2be12a1f 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/trace_profiler_unittest.py +++ b/tools/telemetry/telemetry/core/platform/profiler/trace_profiler_unittest.py @@ -8,7 +8,7 @@ import zipfile from telemetry.core.platform.profiler import trace_profiler -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class TestTraceProfiler(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/core/platform/profiler/vtune_profiler_unittest.py b/tools/telemetry/telemetry/core/platform/profiler/vtune_profiler_unittest.py index b1329c1e7780b9..a4f0ffff3aa89e 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/vtune_profiler_unittest.py +++ b/tools/telemetry/telemetry/core/platform/profiler/vtune_profiler_unittest.py @@ -7,9 +7,9 @@ from telemetry.core.platform.profiler import vtune_profiler from telemetry import decorators -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import simple_mock -from telemetry.unittest_util import tab_test_case +from telemetry.testing import options_for_unittests +from telemetry.testing import simple_mock +from telemetry.testing import tab_test_case class MockPopen(object): diff --git a/tools/telemetry/telemetry/core/platform/tracing_controller_unittest.py b/tools/telemetry/telemetry/core/platform/tracing_controller_unittest.py index c1db4a46681bf6..38e91a2be9edd2 100644 --- a/tools/telemetry/telemetry/core/platform/tracing_controller_unittest.py +++ b/tools/telemetry/telemetry/core/platform/tracing_controller_unittest.py @@ -5,7 +5,7 @@ from telemetry.core.platform import tracing_category_filter from telemetry.core.platform import tracing_options from telemetry import decorators -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class TracingControllerTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/actions/action_runner_unittest.py b/tools/telemetry/telemetry/internal/actions/action_runner_unittest.py index edee114a473240..cd3353d61fce75 100644 --- a/tools/telemetry/telemetry/internal/actions/action_runner_unittest.py +++ b/tools/telemetry/telemetry/internal/actions/action_runner_unittest.py @@ -10,8 +10,8 @@ from telemetry import decorators from telemetry.internal.actions import page_action from telemetry.page import action_runner as action_runner_module +from telemetry.testing import tab_test_case from telemetry.timeline import model -from telemetry.unittest_util import tab_test_case from telemetry.web_perf import timeline_interaction_record as tir_module util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock') diff --git a/tools/telemetry/telemetry/internal/actions/drag_unittest.py b/tools/telemetry/telemetry/internal/actions/drag_unittest.py index c14e85a0092588..439ade62c920de 100644 --- a/tools/telemetry/telemetry/internal/actions/drag_unittest.py +++ b/tools/telemetry/telemetry/internal/actions/drag_unittest.py @@ -8,7 +8,7 @@ from telemetry import decorators from telemetry.internal.actions import drag from telemetry.internal.actions import page_action -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class DragActionTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/actions/load_media_unittest.py b/tools/telemetry/telemetry/internal/actions/load_media_unittest.py index b43567b4366466..cfc7d1a8928f6e 100644 --- a/tools/telemetry/telemetry/internal/actions/load_media_unittest.py +++ b/tools/telemetry/telemetry/internal/actions/load_media_unittest.py @@ -5,7 +5,7 @@ from telemetry.core import exceptions from telemetry import decorators from telemetry.internal.actions.load_media import LoadMediaAction -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class LoadMediaActionTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/actions/loop_unittest.py b/tools/telemetry/telemetry/internal/actions/loop_unittest.py index aab2b010823107..690d1c5fda634c 100644 --- a/tools/telemetry/telemetry/internal/actions/loop_unittest.py +++ b/tools/telemetry/telemetry/internal/actions/loop_unittest.py @@ -5,7 +5,7 @@ from telemetry.core import exceptions from telemetry import decorators from telemetry.internal.actions import loop -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case AUDIO_1_LOOP_CHECK = 'window.__hasEventCompleted("#audio_1", "loop");' VIDEO_1_LOOP_CHECK = 'window.__hasEventCompleted("#video_1", "loop");' diff --git a/tools/telemetry/telemetry/internal/actions/mouse_click_unittest.py b/tools/telemetry/telemetry/internal/actions/mouse_click_unittest.py index 70813d635a621a..6ad06c7fcaa4d2 100644 --- a/tools/telemetry/telemetry/internal/actions/mouse_click_unittest.py +++ b/tools/telemetry/telemetry/internal/actions/mouse_click_unittest.py @@ -4,7 +4,7 @@ from telemetry.core import exceptions from telemetry.internal.actions import mouse_click -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class MouseClickActionTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/actions/navigate_unittest.py b/tools/telemetry/telemetry/internal/actions/navigate_unittest.py index bcfe3d9bbd9f35..a327d8457b41dd 100644 --- a/tools/telemetry/telemetry/internal/actions/navigate_unittest.py +++ b/tools/telemetry/telemetry/internal/actions/navigate_unittest.py @@ -3,7 +3,7 @@ # found in the LICENSE file. from telemetry.internal.actions import navigate -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class NavigateActionTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/actions/page_action_unittest.py b/tools/telemetry/telemetry/internal/actions/page_action_unittest.py index aaacc0980c0374..33d3a69c88ddbe 100644 --- a/tools/telemetry/telemetry/internal/actions/page_action_unittest.py +++ b/tools/telemetry/telemetry/internal/actions/page_action_unittest.py @@ -6,7 +6,7 @@ from telemetry.internal.actions import page_action from telemetry.page import action_runner -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class PageActionTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/actions/pinch_unittest.py b/tools/telemetry/telemetry/internal/actions/pinch_unittest.py index c709198a0d84a6..1c2ae330d7954f 100644 --- a/tools/telemetry/telemetry/internal/actions/pinch_unittest.py +++ b/tools/telemetry/telemetry/internal/actions/pinch_unittest.py @@ -4,7 +4,7 @@ from telemetry.internal.actions import page_action from telemetry.page import action_runner as action_runner_module -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class PinchActionTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/actions/play_unittest.py b/tools/telemetry/telemetry/internal/actions/play_unittest.py index 19e147409a76cd..20bf8d2caef9d6 100644 --- a/tools/telemetry/telemetry/internal/actions/play_unittest.py +++ b/tools/telemetry/telemetry/internal/actions/play_unittest.py @@ -5,7 +5,7 @@ from telemetry.core import exceptions from telemetry import decorators from telemetry.internal.actions import play -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case AUDIO_1_PLAYING_CHECK = 'window.__hasEventCompleted("#audio_1", "playing");' VIDEO_1_PLAYING_CHECK = 'window.__hasEventCompleted("#video_1", "playing");' diff --git a/tools/telemetry/telemetry/internal/actions/scroll_unittest.py b/tools/telemetry/telemetry/internal/actions/scroll_unittest.py index d0798c891342ef..b708dab8abcee9 100644 --- a/tools/telemetry/telemetry/internal/actions/scroll_unittest.py +++ b/tools/telemetry/telemetry/internal/actions/scroll_unittest.py @@ -5,7 +5,7 @@ import os from telemetry.internal.actions import scroll -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class ScrollActionTest(tab_test_case.TabTestCase): def testScrollAction(self): diff --git a/tools/telemetry/telemetry/internal/actions/seek_unittest.py b/tools/telemetry/telemetry/internal/actions/seek_unittest.py index 50926da7996f95..bea3e6372529cf 100644 --- a/tools/telemetry/telemetry/internal/actions/seek_unittest.py +++ b/tools/telemetry/telemetry/internal/actions/seek_unittest.py @@ -5,7 +5,7 @@ from telemetry.core import exceptions from telemetry import decorators from telemetry.internal.actions import seek -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case AUDIO_1_SEEKED_CHECK = 'window.__hasEventCompleted("#audio_1", "seeked");' VIDEO_1_SEEKED_CHECK = 'window.__hasEventCompleted("#video_1", "seeked");' diff --git a/tools/telemetry/telemetry/internal/app/android_app_unittest.py b/tools/telemetry/telemetry/internal/app/android_app_unittest.py index 8c8cd15a62c95e..ab8ad3603728e4 100644 --- a/tools/telemetry/telemetry/internal/app/android_app_unittest.py +++ b/tools/telemetry/telemetry/internal/app/android_app_unittest.py @@ -11,7 +11,7 @@ from telemetry.core import util from telemetry.internal.app import android_app from telemetry.internal.backends import android_app_backend -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') from pylib.device import intent # pylint: disable=import-error diff --git a/tools/telemetry/telemetry/internal/backends/android_command_line_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/android_command_line_backend_unittest.py index a7b1b8a7c56d62..a19a868b6759b1 100644 --- a/tools/telemetry/telemetry/internal/backends/android_command_line_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/android_command_line_backend_unittest.py @@ -5,10 +5,10 @@ import logging import unittest -from telemetry import decorators from telemetry.core import util +from telemetry import decorators from telemetry.internal.backends import android_command_line_backend -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') from pylib.device import device_utils # 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 366b3971d179ad..7e04024b728b9b 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 @@ -7,7 +7,7 @@ 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 +from telemetry.testing import system_stub util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock') import mock # pylint: disable=import-error diff --git a/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py index 9dbcd315874a19..22cbad2a92c4a5 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py @@ -18,7 +18,7 @@ from telemetry.internal.browser import user_agent from telemetry.internal.browser import web_contents from telemetry.internal import forwarders -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests from telemetry.util import wpr_modes 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 d3325e9f6ee770..3745fac36ce01c 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/cros_test_case.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/cros_test_case.py @@ -9,7 +9,7 @@ from telemetry.core import util from telemetry.internal.browser import browser_finder from telemetry.internal.browser import extension_to_load -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests class CrOSTestCase(unittest.TestCase): 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 05422c8d8ca9cf..fd7aeb30a28f08 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 @@ -6,7 +6,7 @@ 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 +from telemetry.testing import system_stub # This file verifies the logic for finding a browser instance on all platforms diff --git a/tools/telemetry/telemetry/internal/backends/chrome/tab_list_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/tab_list_backend_unittest.py index 98a2dc855dabcb..974afadc5e970e 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome/tab_list_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/tab_list_backend_unittest.py @@ -4,7 +4,7 @@ from telemetry.core import exceptions from telemetry import decorators -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class TabListBackendTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend_unittest.py index febe4ce66a380b..1eb928e4c15627 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend_unittest.py @@ -3,7 +3,7 @@ # found in the LICENSE file. from telemetry import decorators -from telemetry.unittest_util import browser_test_case +from telemetry.testing import browser_test_case class DevToolsClientBackendTest(browser_test_case.BrowserTestCase): diff --git a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_console_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_console_unittest.py index 0bfe65c6aebc96..18fa3b1889a8e2 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_console_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_console_unittest.py @@ -6,7 +6,7 @@ import StringIO from telemetry.core import util -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class TabConsoleTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_memory_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_memory_unittest.py index 355c5815e88c4c..9b7f5e0dfb5332 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_memory_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_memory_unittest.py @@ -3,7 +3,7 @@ # found in the LICENSE file. from telemetry import decorators -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class InspectorMemoryTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_network_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_network_unittest.py index 5242fc78ff41ab..752ee05d87fb76 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_network_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_network_unittest.py @@ -4,7 +4,7 @@ from telemetry import decorators from telemetry.internal.backends.chrome_inspector import inspector_network -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class InspectorNetworkTabTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_page_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_page_unittest.py index 486e510f04dac7..935b8dfaab2d2f 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_page_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_page_unittest.py @@ -3,7 +3,7 @@ # found in the LICENSE file. from telemetry import decorators -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case from telemetry.util import image_util diff --git a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_runtime_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_runtime_unittest.py index df3307762f5432..7b90d0621303dc 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_runtime_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_runtime_unittest.py @@ -5,7 +5,7 @@ from telemetry.core import exceptions from telemetry.core import util from telemetry import decorators -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class InspectorRuntimeTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_websocket_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_websocket_unittest.py index 448a0668909af3..ea4da863323828 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_websocket_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_websocket_unittest.py @@ -7,7 +7,7 @@ from telemetry import decorators from telemetry.internal.backends.chrome_inspector import inspector_websocket from telemetry.internal.backends.chrome_inspector import websocket -from telemetry.unittest_util import simple_mock +from telemetry.testing import simple_mock class FakeSocket(object): diff --git a/tools/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py index babb0ec0c1645d..6654087e6d5411 100644 --- a/tools/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py @@ -9,9 +9,9 @@ from telemetry.core import util from telemetry.internal.backends.chrome_inspector import tracing_backend from telemetry.internal.backends.chrome_inspector import websocket +from telemetry.testing import simple_mock +from telemetry.testing import tab_test_case from telemetry.timeline import model as model_module -from telemetry.unittest_util import simple_mock -from telemetry.unittest_util import tab_test_case util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock') import mock # pylint:disable=import-error 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 8b24d4393e8606..922c1655d6adba 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 @@ -9,8 +9,8 @@ from telemetry import benchmark 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 +from telemetry.testing import options_for_unittests +from telemetry.testing import simple_mock _ = simple_mock.DONT_CARE 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 0e7225e3b1e899..e1f707acf06466 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 @@ -9,8 +9,8 @@ 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 +from telemetry.testing import simple_mock +from telemetry.testing import system_stub class TrybotBrowserFinderTest(unittest.TestCase): diff --git a/tools/telemetry/telemetry/internal/browser/browser_credentials.py b/tools/telemetry/telemetry/internal/browser/browser_credentials.py index 4d17edc1742faf..ac9cc45a57a278 100644 --- a/tools/telemetry/telemetry/internal/browser/browser_credentials.py +++ b/tools/telemetry/telemetry/internal/browser/browser_credentials.py @@ -10,7 +10,7 @@ from telemetry.internal.backends import codepen_credentials_backend from telemetry.internal.backends import facebook_credentials_backend from telemetry.internal.backends import google_credentials_backend -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests class CredentialsError(Exception): diff --git a/tools/telemetry/telemetry/internal/browser/browser_unittest.py b/tools/telemetry/telemetry/internal/browser/browser_unittest.py index 22a0502cab685a..ac3db387f8658c 100644 --- a/tools/telemetry/telemetry/internal/browser/browser_unittest.py +++ b/tools/telemetry/telemetry/internal/browser/browser_unittest.py @@ -17,8 +17,8 @@ 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 +from telemetry.testing import browser_test_case +from telemetry.testing import options_for_unittests class BrowserTest(browser_test_case.BrowserTestCase): diff --git a/tools/telemetry/telemetry/internal/browser/extension_unittest.py b/tools/telemetry/telemetry/internal/browser/extension_unittest.py index 795cb770c659f2..3da4f76de85516 100644 --- a/tools/telemetry/telemetry/internal/browser/extension_unittest.py +++ b/tools/telemetry/telemetry/internal/browser/extension_unittest.py @@ -11,7 +11,7 @@ from telemetry.core import util from telemetry.internal.browser import browser_finder from telemetry.internal.browser import extension_to_load -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests class ExtensionTest(unittest.TestCase): diff --git a/tools/telemetry/telemetry/internal/browser/tab_unittest.py b/tools/telemetry/telemetry/internal/browser/tab_unittest.py index d010738b3329f9..00ec98b3719d0e 100644 --- a/tools/telemetry/telemetry/internal/browser/tab_unittest.py +++ b/tools/telemetry/telemetry/internal/browser/tab_unittest.py @@ -11,8 +11,8 @@ from telemetry.core import util from telemetry import decorators from telemetry.internal.image_processing import video +from telemetry.testing import tab_test_case from telemetry.timeline import model -from telemetry.unittest_util import tab_test_case from telemetry.util import image_util from telemetry.util import rgba_color diff --git a/tools/telemetry/telemetry/internal/browser/user_agent_unittest.py b/tools/telemetry/telemetry/internal/browser/user_agent_unittest.py index c6f61973121662..19c5d6850bebda 100644 --- a/tools/telemetry/telemetry/internal/browser/user_agent_unittest.py +++ b/tools/telemetry/telemetry/internal/browser/user_agent_unittest.py @@ -4,7 +4,7 @@ from telemetry import decorators from telemetry.internal.browser import user_agent -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case class MobileUserAgentTest(tab_test_case.TabTestCase): diff --git a/tools/telemetry/telemetry/internal/results/gtest_progress_reporter_unittest.py b/tools/telemetry/telemetry/internal/results/gtest_progress_reporter_unittest.py index 9f11443099dcd2..7f936f9b7bca1f 100644 --- a/tools/telemetry/telemetry/internal/results/gtest_progress_reporter_unittest.py +++ b/tools/telemetry/telemetry/internal/results/gtest_progress_reporter_unittest.py @@ -10,8 +10,8 @@ from telemetry.internal.results import gtest_progress_reporter from telemetry.internal.results import page_test_results from telemetry import page as page_module -from telemetry.unittest_util import simple_mock -from telemetry.unittest_util import stream +from telemetry.testing import simple_mock +from telemetry.testing import stream from telemetry.value import failure from telemetry.value import skip diff --git a/tools/telemetry/telemetry/internal/story_runner_unittest.py b/tools/telemetry/telemetry/internal/story_runner_unittest.py index 378c7e0cd71212..139272b68ea96e 100644 --- a/tools/telemetry/telemetry/internal/story_runner_unittest.py +++ b/tools/telemetry/telemetry/internal/story_runner_unittest.py @@ -19,8 +19,8 @@ from telemetry.page import page_test from telemetry.page import test_expectations from telemetry import story as story_module -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import system_stub +from telemetry.testing import options_for_unittests +from telemetry.testing import system_stub from telemetry.value import list_of_scalar_values from telemetry.value import scalar from telemetry.value import summary as summary_module diff --git a/tools/telemetry/telemetry/internal/util/find_dependencies.py b/tools/telemetry/telemetry/internal/util/find_dependencies.py index ce5ee839710871..2082565ea83ad0 100644 --- a/tools/telemetry/telemetry/internal/util/find_dependencies.py +++ b/tools/telemetry/telemetry/internal/util/find_dependencies.py @@ -133,7 +133,7 @@ def FindDependencies(target_paths, options): os.path.join(path.GetTelemetryDir(), 'telemetry', 'benchmark_runner.py'))) dependencies |= FindPythonDependencies(os.path.realpath( os.path.join(path.GetTelemetryDir(), - 'telemetry', 'unittest_util', 'run_tests.py'))) + 'telemetry', 'testing', 'run_tests.py'))) dependencies |= FindBootstrapDependencies(path.GetTelemetryDir()) # Add dependencies. 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 32464549caa455..efeb4d92a15a7b 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 @@ -25,8 +25,8 @@ from telemetry.page import page_test from telemetry.page import shared_page_state from telemetry.page import test_expectations -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import system_stub +from telemetry.testing import options_for_unittests +from telemetry.testing import system_stub # pylint: disable=bad-super-call diff --git a/tools/telemetry/telemetry/page/page_test_unittest.py b/tools/telemetry/telemetry/page/page_test_unittest.py index fdcb5d7ece62fd..df4fa2a97710d1 100644 --- a/tools/telemetry/telemetry/page/page_test_unittest.py +++ b/tools/telemetry/telemetry/page/page_test_unittest.py @@ -10,8 +10,8 @@ from telemetry import story from telemetry.page import page as page_module from telemetry.page import page_test -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case from telemetry.util import wpr_modes from telemetry.wpr import archive_info diff --git a/tools/telemetry/telemetry/page/shared_page_state_unittest.py b/tools/telemetry/telemetry/page/shared_page_state_unittest.py index e15a77c78d131d..d72f4adca149e3 100644 --- a/tools/telemetry/telemetry/page/shared_page_state_unittest.py +++ b/tools/telemetry/telemetry/page/shared_page_state_unittest.py @@ -10,7 +10,7 @@ from telemetry.page import page_test from telemetry.page import shared_page_state from telemetry import story as story_module -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests from telemetry.util import wpr_modes diff --git a/tools/telemetry/telemetry/record_wpr_unittest.py b/tools/telemetry/telemetry/record_wpr_unittest.py index 3b071bfe1eb412..fabb9b077d60f0 100644 --- a/tools/telemetry/telemetry/record_wpr_unittest.py +++ b/tools/telemetry/telemetry/record_wpr_unittest.py @@ -12,7 +12,7 @@ from telemetry.page import page as page_module from telemetry.page import page_test from telemetry import record_wpr -from telemetry.unittest_util import tab_test_case +from telemetry.testing import tab_test_case from telemetry.util import wpr_modes diff --git a/tools/telemetry/telemetry/unittest_util/__init__.py b/tools/telemetry/telemetry/testing/__init__.py similarity index 100% rename from tools/telemetry/telemetry/unittest_util/__init__.py rename to tools/telemetry/telemetry/testing/__init__.py diff --git a/tools/telemetry/telemetry/unittest_util/browser_test_case.py b/tools/telemetry/telemetry/testing/browser_test_case.py similarity index 96% rename from tools/telemetry/telemetry/unittest_util/browser_test_case.py rename to tools/telemetry/telemetry/testing/browser_test_case.py index 210251a45c4c05..4d4ec514766e4d 100644 --- a/tools/telemetry/telemetry/unittest_util/browser_test_case.py +++ b/tools/telemetry/telemetry/testing/browser_test_case.py @@ -7,7 +7,7 @@ from telemetry.internal.browser import browser_finder from telemetry.internal.util import path -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests current_browser_options = None current_browser = None diff --git a/tools/telemetry/telemetry/unittest_util/decorators_unittest.py b/tools/telemetry/telemetry/testing/decorators_unittest.py similarity index 100% rename from tools/telemetry/telemetry/unittest_util/decorators_unittest.py rename to tools/telemetry/telemetry/testing/decorators_unittest.py diff --git a/tools/telemetry/telemetry/unittest_util/disabled_cases.py b/tools/telemetry/telemetry/testing/disabled_cases.py similarity index 100% rename from tools/telemetry/telemetry/unittest_util/disabled_cases.py rename to tools/telemetry/telemetry/testing/disabled_cases.py diff --git a/tools/telemetry/telemetry/unittest_util/gtest_progress_reporter.py b/tools/telemetry/telemetry/testing/gtest_progress_reporter.py similarity index 98% rename from tools/telemetry/telemetry/unittest_util/gtest_progress_reporter.py rename to tools/telemetry/telemetry/testing/gtest_progress_reporter.py index 0c39590a856767..68fd878009599d 100644 --- a/tools/telemetry/telemetry/unittest_util/gtest_progress_reporter.py +++ b/tools/telemetry/telemetry/testing/gtest_progress_reporter.py @@ -7,7 +7,7 @@ import unittest from telemetry.internal.util import exception_formatter -from telemetry.unittest_util import progress_reporter +from telemetry.testing import progress_reporter def _FormatTestName(test): diff --git a/tools/telemetry/telemetry/unittest_util/gtest_progress_reporter_unittest.py b/tools/telemetry/telemetry/testing/gtest_progress_reporter_unittest.py similarity index 95% rename from tools/telemetry/telemetry/unittest_util/gtest_progress_reporter_unittest.py rename to tools/telemetry/telemetry/testing/gtest_progress_reporter_unittest.py index bab63f6b1c815d..a6bdcb213f8d8d 100644 --- a/tools/telemetry/telemetry/unittest_util/gtest_progress_reporter_unittest.py +++ b/tools/telemetry/telemetry/testing/gtest_progress_reporter_unittest.py @@ -6,9 +6,9 @@ import unittest from telemetry.core import exceptions -from telemetry.unittest_util import gtest_progress_reporter -from telemetry.unittest_util import simple_mock -from telemetry.unittest_util import stream +from telemetry.testing import gtest_progress_reporter +from telemetry.testing import simple_mock +from telemetry.testing import stream try: diff --git a/tools/telemetry/telemetry/unittest_util/options_for_unittests.py b/tools/telemetry/telemetry/testing/options_for_unittests.py similarity index 100% rename from tools/telemetry/telemetry/unittest_util/options_for_unittests.py rename to tools/telemetry/telemetry/testing/options_for_unittests.py diff --git a/tools/telemetry/telemetry/unittest_util/page_test_test_case.py b/tools/telemetry/telemetry/testing/page_test_test_case.py similarity index 98% rename from tools/telemetry/telemetry/unittest_util/page_test_test_case.py rename to tools/telemetry/telemetry/testing/page_test_test_case.py index 4c73e84327743c..f753ed025da5cf 100644 --- a/tools/telemetry/telemetry/unittest_util/page_test_test_case.py +++ b/tools/telemetry/telemetry/testing/page_test_test_case.py @@ -15,7 +15,7 @@ from telemetry.page import page as page_module from telemetry.page import page_test from telemetry.page import test_expectations -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests class BasicTestPage(page_module.Page): diff --git a/tools/telemetry/telemetry/unittest_util/progress_reporter.py b/tools/telemetry/telemetry/testing/progress_reporter.py similarity index 98% rename from tools/telemetry/telemetry/unittest_util/progress_reporter.py rename to tools/telemetry/telemetry/testing/progress_reporter.py index e1597aedd2054a..39d20fa4e1c52f 100644 --- a/tools/telemetry/telemetry/unittest_util/progress_reporter.py +++ b/tools/telemetry/telemetry/testing/progress_reporter.py @@ -5,7 +5,7 @@ import unittest from telemetry.core import util -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import options_for_unittests class ProgressReporter(object): diff --git a/tools/telemetry/telemetry/unittest_util/progress_reporter_unittest.py b/tools/telemetry/telemetry/testing/progress_reporter_unittest.py similarity index 96% rename from tools/telemetry/telemetry/unittest_util/progress_reporter_unittest.py rename to tools/telemetry/telemetry/testing/progress_reporter_unittest.py index a7274975ee65b7..2a6088235fa799 100644 --- a/tools/telemetry/telemetry/unittest_util/progress_reporter_unittest.py +++ b/tools/telemetry/telemetry/testing/progress_reporter_unittest.py @@ -4,7 +4,7 @@ import unittest -from telemetry.unittest_util import progress_reporter +from telemetry.testing import progress_reporter class TestFoo(unittest.TestCase): diff --git a/tools/telemetry/telemetry/testing/results.html b/tools/telemetry/telemetry/testing/results.html new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/tools/telemetry/telemetry/unittest_util/run_chromeos_tests.py b/tools/telemetry/telemetry/testing/run_chromeos_tests.py similarity index 97% rename from tools/telemetry/telemetry/unittest_util/run_chromeos_tests.py rename to tools/telemetry/telemetry/testing/run_chromeos_tests.py index ecfcb8147cd828..47c902ae457347 100644 --- a/tools/telemetry/telemetry/unittest_util/run_chromeos_tests.py +++ b/tools/telemetry/telemetry/testing/run_chromeos_tests.py @@ -5,7 +5,7 @@ import os from telemetry.core import util -from telemetry.unittest_util import run_tests +from telemetry.testing import run_tests def RunTestsForChromeOS(browser_type, unit_tests, perf_tests): diff --git a/tools/telemetry/telemetry/unittest_util/run_tests.py b/tools/telemetry/telemetry/testing/run_tests.py similarity index 98% rename from tools/telemetry/telemetry/unittest_util/run_tests.py rename to tools/telemetry/telemetry/testing/run_tests.py index c3033ed256e3be..800f3074ac3af8 100644 --- a/tools/telemetry/telemetry/unittest_util/run_tests.py +++ b/tools/telemetry/telemetry/testing/run_tests.py @@ -10,8 +10,8 @@ from telemetry.internal.browser import browser_finder_exceptions from telemetry.internal.browser import browser_options from telemetry.internal.util import command_line -from telemetry.unittest_util import browser_test_case -from telemetry.unittest_util import options_for_unittests +from telemetry.testing import browser_test_case +from telemetry.testing import options_for_unittests util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'third_party', 'typ') diff --git a/tools/telemetry/telemetry/unittest_util/run_tests_unittest.py b/tools/telemetry/telemetry/testing/run_tests_unittest.py similarity index 96% rename from tools/telemetry/telemetry/unittest_util/run_tests_unittest.py rename to tools/telemetry/telemetry/testing/run_tests_unittest.py index fce2aca0b2232f..3feb88ee08729f 100644 --- a/tools/telemetry/telemetry/unittest_util/run_tests_unittest.py +++ b/tools/telemetry/telemetry/testing/run_tests_unittest.py @@ -5,7 +5,7 @@ import unittest from telemetry.core import util -from telemetry.unittest_util import run_tests +from telemetry.testing import run_tests class MockArgs(object): @@ -44,7 +44,7 @@ def _GetEnabledTests(self, browser_type, os_name, os_version_name, host = runner.host runner.top_level_dir = util.GetTelemetryDir() runner.args.tests = [host.join(util.GetTelemetryDir(), - 'telemetry', 'unittest_util', 'disabled_cases.py')] + 'telemetry', 'testing', 'disabled_cases.py')] possible_browser = MockPossibleBrowser( browser_type, os_name, os_version_name, supports_tab_control) runner.classifier = run_tests.GetClassifier(MockArgs(), possible_browser) diff --git a/tools/telemetry/telemetry/unittest_util/simple_mock.py b/tools/telemetry/telemetry/testing/simple_mock.py similarity index 100% rename from tools/telemetry/telemetry/unittest_util/simple_mock.py rename to tools/telemetry/telemetry/testing/simple_mock.py diff --git a/tools/telemetry/telemetry/unittest_util/simple_mock_unittest.py b/tools/telemetry/telemetry/testing/simple_mock_unittest.py similarity index 97% rename from tools/telemetry/telemetry/unittest_util/simple_mock_unittest.py rename to tools/telemetry/telemetry/testing/simple_mock_unittest.py index 254a7a16698e1f..bbc63b990b7eab 100644 --- a/tools/telemetry/telemetry/unittest_util/simple_mock_unittest.py +++ b/tools/telemetry/telemetry/testing/simple_mock_unittest.py @@ -3,7 +3,7 @@ # found in the LICENSE file. import unittest -from telemetry.unittest_util import simple_mock +from telemetry.testing import simple_mock _ = simple_mock.DONT_CARE diff --git a/tools/telemetry/telemetry/unittest_util/story_set_smoke_test.py b/tools/telemetry/telemetry/testing/story_set_smoke_test.py similarity index 100% rename from tools/telemetry/telemetry/unittest_util/story_set_smoke_test.py rename to tools/telemetry/telemetry/testing/story_set_smoke_test.py diff --git a/tools/telemetry/telemetry/unittest_util/stream.py b/tools/telemetry/telemetry/testing/stream.py similarity index 100% rename from tools/telemetry/telemetry/unittest_util/stream.py rename to tools/telemetry/telemetry/testing/stream.py diff --git a/tools/telemetry/telemetry/unittest_util/system_stub.py b/tools/telemetry/telemetry/testing/system_stub.py similarity index 100% rename from tools/telemetry/telemetry/unittest_util/system_stub.py rename to tools/telemetry/telemetry/testing/system_stub.py diff --git a/tools/telemetry/telemetry/unittest_util/system_stub_unittest.py b/tools/telemetry/telemetry/testing/system_stub_unittest.py similarity index 99% rename from tools/telemetry/telemetry/unittest_util/system_stub_unittest.py rename to tools/telemetry/telemetry/testing/system_stub_unittest.py index 9609c34b9029ba..5a23ed4b997145 100644 --- a/tools/telemetry/telemetry/unittest_util/system_stub_unittest.py +++ b/tools/telemetry/telemetry/testing/system_stub_unittest.py @@ -6,8 +6,8 @@ import unittest PERF_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +from telemetry.testing import system_stub from telemetry.internal.testing import system_stub_test_module -from telemetry.unittest_util import system_stub class CloudStorageTest(unittest.TestCase): SUCCESS_FILE_HASH = 'success'.zfill(40) diff --git a/tools/telemetry/telemetry/unittest_util/tab_test_case.py b/tools/telemetry/telemetry/testing/tab_test_case.py similarity index 96% rename from tools/telemetry/telemetry/unittest_util/tab_test_case.py rename to tools/telemetry/telemetry/testing/tab_test_case.py index 8fe4f74d5e865e..c8936881824742 100644 --- a/tools/telemetry/telemetry/unittest_util/tab_test_case.py +++ b/tools/telemetry/telemetry/testing/tab_test_case.py @@ -3,7 +3,7 @@ # found in the LICENSE file. from telemetry.core import exceptions -from telemetry.unittest_util import browser_test_case +from telemetry.testing import browser_test_case class TabTestCase(browser_test_case.BrowserTestCase): diff --git a/tools/telemetry/telemetry/unittest_util/test_page_test_results.py b/tools/telemetry/telemetry/testing/test_page_test_results.py similarity index 100% rename from tools/telemetry/telemetry/unittest_util/test_page_test_results.py rename to tools/telemetry/telemetry/testing/test_page_test_results.py diff --git a/tools/telemetry/telemetry/value/trace_unittest.py b/tools/telemetry/telemetry/value/trace_unittest.py index 7dbb4c51d3a443..8f982e95b13435 100644 --- a/tools/telemetry/telemetry/value/trace_unittest.py +++ b/tools/telemetry/telemetry/value/trace_unittest.py @@ -9,8 +9,8 @@ from telemetry import story from telemetry import page as page_module +from telemetry.testing import system_stub from telemetry.timeline import trace_data -from telemetry.unittest_util import system_stub from telemetry.value import trace diff --git a/tools/telemetry/telemetry/web_perf/metrics/gpu_timeline_unittest.py b/tools/telemetry/telemetry/web_perf/metrics/gpu_timeline_unittest.py index acdfcf3bf7236f..2af5b109ec61a9 100644 --- a/tools/telemetry/telemetry/web_perf/metrics/gpu_timeline_unittest.py +++ b/tools/telemetry/telemetry/web_perf/metrics/gpu_timeline_unittest.py @@ -4,10 +4,10 @@ import unittest +from telemetry.testing import test_page_test_results from telemetry.timeline import async_slice as async_slice_module from telemetry.timeline import model as model_module from telemetry.timeline import slice as slice_module -from telemetry.unittest_util import test_page_test_results from telemetry.web_perf.metrics import gpu_timeline from telemetry.web_perf import timeline_interaction_record as tir_module diff --git a/tools/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py b/tools/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py index 57f0685ddfa35c..f310317c682d0b 100644 --- a/tools/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py +++ b/tools/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py @@ -9,11 +9,11 @@ from telemetry import decorators from telemetry.page import page as page_module from telemetry.page import page_test +from telemetry.testing import page_test_test_case from telemetry.timeline import async_slice from telemetry.timeline import model as model_module -from telemetry.unittest_util import page_test_test_case -from telemetry.web_perf import timeline_interaction_record as tir_module from telemetry.web_perf import smooth_gesture_util as sg_util +from telemetry.web_perf import timeline_interaction_record as tir_module class SmoothGestureUtilTest(unittest.TestCase): diff --git a/tools/telemetry/telemetry/web_perf/timeline_based_page_test_unittest.py b/tools/telemetry/telemetry/web_perf/timeline_based_page_test_unittest.py index 7f8a9416292c32..edce47ecdb7a8f 100644 --- a/tools/telemetry/telemetry/web_perf/timeline_based_page_test_unittest.py +++ b/tools/telemetry/telemetry/web_perf/timeline_based_page_test_unittest.py @@ -5,9 +5,9 @@ from telemetry.core.platform import tracing_category_filter from telemetry import decorators from telemetry.page import page as page_module -from telemetry.unittest_util import browser_test_case -from telemetry.unittest_util import options_for_unittests -from telemetry.unittest_util import page_test_test_case +from telemetry.testing import browser_test_case +from telemetry.testing import options_for_unittests +from telemetry.testing import page_test_test_case from telemetry.util import wpr_modes from telemetry.web_perf import timeline_based_measurement as tbm_module from telemetry.web_perf import timeline_based_page_test as tbpt_module diff --git a/tools/telemetry/telemetry/wpr/archive_info_unittest.py b/tools/telemetry/telemetry/wpr/archive_info_unittest.py index edff08faa42ad4..6f292bf3460b23 100644 --- a/tools/telemetry/telemetry/wpr/archive_info_unittest.py +++ b/tools/telemetry/telemetry/wpr/archive_info_unittest.py @@ -9,7 +9,7 @@ from catapult_base import cloud_storage from telemetry.page import page -from telemetry.unittest_util import system_stub +from telemetry.testing import system_stub from telemetry.wpr import archive_info