tools/telemetry/telemetry/core/platform/android_platform_backend.py - Issue 1087093002: Roll web-page-replay to d6b0f311b2864581e4112ee839086737a51a4dc6. (attempt 2)

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/core/platform/android_platform_backend.py

Issue 1087093002: Roll web-page-replay to d6b0f311b2864581e4112ee839086737a51a4dc6. (attempt 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update DEPs. Created 5 years, 8 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

Index: tools/telemetry/telemetry/core/platform/android_platform_backend.py

diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend.py b/tools/telemetry/telemetry/core/platform/android_platform_backend.py

index 360dbbf5890c0b133d5d86b26c7230bafca6c970..41dadfbe481359d0fadb013dc6b793eb2ec90bc9 100644

--- a/tools/telemetry/telemetry/core/platform/android_platform_backend.py

+++ b/tools/telemetry/telemetry/core/platform/android_platform_backend.py

@@ -34,6 +34,7 @@ util.AddDirToPythonPath(util.GetChromiumSrcDir(),

'third_party', 'webpagereplay')

import adb_install_cert # pylint: disable=F0401

import certutils # pylint: disable=F0401

+import platformsettings # pylint: disable=F0401

# Get build/android scripts into our path.

util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')

@@ -446,7 +447,7 @@ class AndroidPlatformBackend(

'The OpenSSL module is unavailable. '

'Will fallback to ignoring certificate errors.')

return

- if not certutils.has_sni():

+ if not platformsettings.HasSniSupport():

logging.warning(

'Web Page Replay requires SNI support (pyOpenSSL 0.13 or greater) '

'to generate certificates from a test CA. '

« no previous file with comments | « DEPS ('k') | tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py » ('j') | no next file with comments »