Moved unittest_util to testing

BUG=473414 CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:linux_perf_bisect;tryserver.chromium.perf:mac_perf_bisect;tryserver.chromium.perf:android_nexus5_perf_bisect Review URL: https://codereview.chromium.org/1216423002 Cr-Commit-Position: refs/heads/master@{#337656}
Denger-Network · Jul 7, 2015 · 199d27a · 199d27a
1 parent bbc45c7
commit 199d27a
Show file tree

Hide file tree

Showing 108 changed files with 131 additions and 131 deletions.
diff --git 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
@@ -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
@@ -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 = """<!DOCTYPE HTML>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...s/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor_unittest.py b/...s/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
@@ -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
@@ -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
@@ -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
@@ -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):