tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py - Issue 397483002: Move chrome_proxy tests from under tools/perf to tools/chrome_proxy/integration_tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py

Issue 397483002: Move chrome_proxy tests from under tools/perf to tools/chrome_proxy/integration_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed comments and sync'ed Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py ('k') | tools/chrome_proxy/integration_tests/chrome_proxy_metrics.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py

diff --git a/tools/perf/measurements/chrome_proxy.py b/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py

similarity index 98%

rename from tools/perf/measurements/chrome_proxy.py

rename to tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py

index a04df6ab13da63066a0f1ba1ce3f5575fab7fdcb..2471e87cf2a43bc34ea16c704c85d35b36029ff0 100644

--- a/tools/perf/measurements/chrome_proxy.py

+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py

@@ -6,7 +6,7 @@ import base64

import logging

import urlparse

-from metrics import chrome_proxy

+from integration_tests import chrome_proxy_metrics as metrics

from metrics import loading

from telemetry.core import util

from telemetry.page import page_measurement

@@ -31,7 +31,7 @@ class ChromeProxyDataSaving(page_measurement.PageMeasurement):

"""Chrome proxy data daving measurement."""

def __init__(self, *args, **kwargs):

super(ChromeProxyDataSaving, self).__init__(*args, **kwargs)

- self._metrics = chrome_proxy.ChromeProxyMetric()

+ self._metrics = metrics.ChromeProxyMetric()

def WillNavigateToPage(self, page, tab):

tab.ClearCache(force=True)

@@ -50,7 +50,7 @@ class ChromeProxyValidation(page_measurement.PageMeasurement):

def __init__(self, restart_after_each_page=False):

super(ChromeProxyValidation, self).__init__(

needs_browser_restart_after_each_page=restart_after_each_page)

- self._metrics = chrome_proxy.ChromeProxyMetric()

+ self._metrics = metrics.ChromeProxyMetric()

self._page = None

# Whether a timeout exception is expected during the test.

self._expect_timeout = False