tools/telemetry/telemetry/internal/util/webpagereplay.py - Issue 1491183003: [Telemetry] Move WPR life cycle from browser to platform

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/telemetry/telemetry/internal/util/webpagereplay.py

Issue 1491183003: [Telemetry] Move WPR life cycle from browser to platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: work in progress Created 4 years, 11 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/telemetry/telemetry/internal/platform/platform_backend.py ('k') | tools/telemetry/telemetry/page/shared_page_state.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/internal/util/webpagereplay.py

diff --git a/tools/telemetry/telemetry/internal/util/webpagereplay.py b/tools/telemetry/telemetry/internal/util/webpagereplay.py

index d08a00f68de03bf78c0709a2af921765f474df80..422d0bb7fae88977898866ccb93225dde7b3c61a 100644

--- a/tools/telemetry/telemetry/internal/util/webpagereplay.py

+++ b/tools/telemetry/telemetry/internal/util/webpagereplay.py

@@ -16,6 +16,7 @@ import urllib

from telemetry.core import exceptions

from telemetry.core import util

+from telemetry.internal import forwarders

_REPLAY_DIR = os.path.join(

util.GetTelemetryThirdPartyDir(), 'webpagereplay')

@@ -190,7 +191,8 @@ class ReplayServer(object):

"""Start Web Page Replay and verify that it started.

Returns:

- (HTTP_PORT, HTTPS_PORT, DNS_PORT) # DNS_PORT is None if unused.

+ A PortSet(HTTP_PORT, HTTPS_PORT, DNS_PORT) tuple, where DNS_PORT is None

+ if unused.

Raises:

ReplayNotStartedError: if Replay start-up fails.

"""

@@ -204,7 +206,7 @@ class ReplayServer(object):

try:

util.WaitFor(self._IsStarted, 30)

atexit.register(self.StopServer)

- return (

+ return forwarders.PortSet(

self._started_ports['http'],

self._started_ports['https'],

self._started_ports.get('dns'), # None if unused