Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Side by Side Diff: tools/telemetry/telemetry/core/wpr_server.py

Issue 23455009: Use exit command to stop web page replay server. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comment and roll webpagereplay to r520. Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« DEPS ('K') | « chrome/test/functional/webpagereplay.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 from telemetry.core import util 5 from telemetry.core import util
6 6
7 # TODO(tonyg): Move webpagereplay.py to a common location. 7 # TODO(tonyg): Move webpagereplay.py to a common location.
8 util.AddDirToPythonPath( 8 util.AddDirToPythonPath(
9 util.GetChromiumSrcDir(), 'chrome', 'test', 'functional') 9 util.GetChromiumSrcDir(), 'chrome', 'test', 'functional')
10 import webpagereplay # pylint: disable=F0401 10 import webpagereplay # pylint: disable=F0401
11 11
12
12 def GetChromeFlags(replay_host, http_port, https_port): 13 def GetChromeFlags(replay_host, http_port, https_port):
13 return webpagereplay.GetChromeFlags(replay_host, http_port, https_port) 14 return webpagereplay.GetChromeFlags(replay_host, http_port, https_port)
14 15
15 class _WebPageReplayServer(webpagereplay.ReplayServer): # pylint: disable=W0232 16
17 class _WebPageReplayServer(webpagereplay.ReplayServer): # pylint: disable=W0232
16 def _AddDefaultReplayOptions(self): 18 def _AddDefaultReplayOptions(self):
17 """Override. Because '--no-dns_forwarding' is added by default in parent 19 """Override to avoid adding 'no-dns_forwarding' by default.
18 while webdriver-based backends need dns forwarding.""" 20
21 Webdriver-based backends need dns forwarding.
22 """
19 self.replay_options += [ 23 self.replay_options += [
20 '--port', str(self._http_port), 24 '--port', str(self._http_port),
21 '--ssl_port', str(self._https_port), 25 '--ssl_port', str(self._https_port),
22 '--use_closest_match', 26 '--use_closest_match',
23 '--log_level', 'warning' 27 '--log_level', 'warning'
24 ] 28 ]
25 29
30
26 class ReplayServer(object): 31 class ReplayServer(object):
27 def __init__(self, browser_backend, path, is_record_mode, is_append_mode, 32 def __init__(self, browser_backend, path, is_record_mode, is_append_mode,
28 make_javascript_deterministic, webpagereplay_host, 33 make_javascript_deterministic, webpagereplay_host,
29 webpagereplay_local_http_port, webpagereplay_local_https_port, 34 webpagereplay_local_http_port, webpagereplay_local_https_port,
30 webpagereplay_remote_http_port, webpagereplay_remote_https_port): 35 webpagereplay_remote_http_port, webpagereplay_remote_https_port):
31 self._browser_backend = browser_backend 36 self._browser_backend = browser_backend
32 self._forwarder = None 37 self._forwarder = None
33 self._web_page_replay = None 38 self._web_page_replay = None
34 self._is_record_mode = is_record_mode 39 self._is_record_mode = is_record_mode
35 self._is_append_mode = is_append_mode 40 self._is_append_mode = is_append_mode
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 def __exit__(self, *args): 73 def __exit__(self, *args):
69 self.Close() 74 self.Close()
70 75
71 def Close(self): 76 def Close(self):
72 if self._forwarder: 77 if self._forwarder:
73 self._forwarder.Close() 78 self._forwarder.Close()
74 self._forwarder = None 79 self._forwarder = None
75 if self._web_page_replay: 80 if self._web_page_replay:
76 self._web_page_replay.StopServer() 81 self._web_page_replay.StopServer()
77 self._web_page_replay = None 82 self._web_page_replay = None
OLDNEW
« DEPS ('K') | « chrome/test/functional/webpagereplay.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698