summaryrefslogtreecommitdiffstats
path: root/tools/chrome_proxy
diff options
context:
space:
mode:
Diffstat (limited to 'tools/chrome_proxy')
-rw-r--r--tools/chrome_proxy/common/network_metrics_unittest.py2
-rw-r--r--tools/chrome_proxy/integration_tests/chrome_proxy_metrics_unittest.py2
-rw-r--r--tools/chrome_proxy/live_tests/chrome_proxy_metrics_unittest.py2
-rwxr-xr-xtools/chrome_proxy/run_tests2
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))