build/android/pylib/instrumentation/setup.py - Issue 1389213003: [Cronet] Use Https for Quic Test Server

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: build/android/pylib/instrumentation/setup.py

Issue 1389213003: [Cronet] Use Https for Quic Test Server (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ryancl

Patch Set: Address Misha's comments Created 5 years, 2 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:

Index: build/android/pylib/instrumentation/setup.py

diff --git a/build/android/pylib/instrumentation/setup.py b/build/android/pylib/instrumentation/setup.py

index 43b059663c63a937ebaab9983dfec7290ac70aa4..ceaab042aa1ff788d64cfd9c91661d6835aebcfc 100644

--- a/build/android/pylib/instrumentation/setup.py

+++ b/build/android/pylib/instrumentation/setup.py

@@ -31,7 +31,8 @@ def _PushExtraSuiteDataDeps(device, test_apk):

Args:

test_apk: The test suite basename for which to return file paths.

"""

- if test_apk in ['ChromeTest', 'ContentShellTest']:

+ if test_apk in ['ChromeTest', 'ContentShellTest',

+ 'CronetTestInstrumentation']:

test_files = 'net/data/ssl/certificates'

host_device_file_tuple = [

(os.path.join(constants.DIR_SOURCE_ROOT, test_files),