| Index: telemetry/telemetry/internal/util/webpagereplay_go_server.py
|
| diff --git a/telemetry/telemetry/internal/util/webpagereplay_go_server.py b/telemetry/telemetry/internal/util/webpagereplay_go_server.py
|
| index 0879d6d840637b620cc5961b9cad4a205da67bab..a757d455168bc7b620cc5754fba4ed417b531f22 100644
|
| --- a/telemetry/telemetry/internal/util/webpagereplay_go_server.py
|
| +++ b/telemetry/telemetry/internal/util/webpagereplay_go_server.py
|
| @@ -20,8 +20,12 @@ from telemetry.internal.util import binary_manager
|
|
|
| import py_utils
|
|
|
| +
|
| _WPR_DIR = os.path.abspath(os.path.join(
|
| util.GetCatapultDir(), 'web_page_replay_go'))
|
| +_WPR_KEY_FILE = os.path.join(_WPR_DIR, 'wpr_key.pem')
|
| +_WPR_CERT_FILE = os.path.join(_WPR_DIR, 'wpr_cert.pem')
|
| +
|
|
|
| class ReplayError(Exception):
|
| """Catch-all exception for the module."""
|
| @@ -118,6 +122,8 @@ class ReplayServer(object):
|
| else:
|
| subprocess.check_call(
|
| [go_binary_path, 'installroot',
|
| + '--https_cert_file=%s' % _WPR_CERT_FILE,
|
| + '--https_key_file=%s' % _WPR_KEY_FILE,
|
| '--android_device_id=%s' % android_device_id,
|
| '--adb_binary_path=%s' % adb_path])
|
|
|
| @@ -141,6 +147,8 @@ class ReplayServer(object):
|
| else:
|
| subprocess.check_call(
|
| [go_binary_path, 'removeroot',
|
| + '--https_cert_file=%s' % _WPR_CERT_FILE,
|
| + '--https_key_file=%s' % _WPR_KEY_FILE,
|
| '--android_device_id=%s' % android_device_id,
|
| '--adb_binary_path=%s' % adb_path])
|
|
|
| @@ -168,14 +176,12 @@ class ReplayServer(object):
|
| cmd_line.append('record')
|
| else:
|
| cmd_line.append('replay')
|
| - key_file = os.path.join(_WPR_DIR, 'wpr_key.pem')
|
| - cert_file = os.path.join(_WPR_DIR, 'wpr_cert.pem')
|
| inject_script = os.path.join(_WPR_DIR, 'deterministic.js')
|
| cmd_line.extend([
|
| '--http_port=%s' % http_port,
|
| '--https_port=%s' % https_port,
|
| - '--https_key_file=%s' % key_file,
|
| - '--https_cert_file=%s' % cert_file])
|
| + '--https_key_file=%s' % _WPR_KEY_FILE,
|
| + '--https_cert_file=%s' % _WPR_CERT_FILE])
|
| if '--inject_scripts=' in replay_options:
|
| cmd_line.append('--inject_scripts=')
|
| else:
|
|
|