diff options
| author | sullivan <sullivan@chromium.org> | 2015-07-07 12:00:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-07 19:01:21 +0000 |
| commit | 199d27a6b732a1b501fda0530e13b2cc05efcf9f (patch) | |
| tree | 35bd824dd159761c4d0197a374fa98ac94b17c8e /tools/chrome_proxy | |
| parent | bbc45c718b49c46273f925151e0863bd43558b6a (diff) | |
| download | chromium_src-199d27a6b732a1b501fda0530e13b2cc05efcf9f.zip chromium_src-199d27a6b732a1b501fda0530e13b2cc05efcf9f.tar.gz chromium_src-199d27a6b732a1b501fda0530e13b2cc05efcf9f.tar.bz2 | |
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}
Diffstat (limited to 'tools/chrome_proxy')
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/chrome_proxy/common/network_metrics_unittest.py b/tools/chrome_proxy/common/network_metrics_unittest.py index c40e526..fe1e48f 100644 --- a/tools/chrome_proxy/common/network_metrics_unittest.py +++ b/tools/chrome_proxy/common/network_metrics_unittest.py @@ -6,8 +6,8 @@ import base64 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 index 0f61619..3b2240b 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 @@ import unittest 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 c2e2571..1bb9c4a 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 @@ import unittest 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 11780b1..aff7dcd 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)) |