build/android/pylib/instrumentation/instrumentation_test_instance.py - Issue 1465383003: [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer.

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/instrumentation_test_instance.py

Issue 1465383003: [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: yfriedman comments Created 5 years, 1 month 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

« base/test/android/java/templates/NativeTestLibraries.template ('K') | « base/test/android/javatests/src/org/chromium/base/test/library_loader/TestLibraryLoader.java ('k') | build/android/pylib/local/device/local_device_instrumentation_test_run.py » ('j') | net/net.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 278ffb2f7212efa6c25b77ebacf39a202db183d6..95a5fe34129385298f0824f0f117143491a6fc65 100644

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

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

@@ -33,9 +33,6 @@ _DEFAULT_ANNOTATIONS = [

'EnormousTest', 'IntegrationTest']

_EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS = [

'DisabledTest', 'FlakyTest']

-_EXTRA_ENABLE_HTTP_SERVER = (

- 'org.chromium.chrome.test.ChromeInstrumentationTestRunner.'

- + 'EnableTestHttpServer')

_EXTRA_DRIVER_TEST_LIST = (

'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestList')

_EXTRA_DRIVER_TEST_LIST_FILE = (

@@ -585,12 +582,6 @@ class InstrumentationTestInstance(test_instance.TestInstance):

new_tests.append(parameterized_t)

return tests + new_tests

- @staticmethod

- def GetHttpServerEnvironmentVars():

- return {

- _EXTRA_ENABLE_HTTP_SERVER: None,

- }

def GetDriverEnvironmentVars(

self, test_list=None, test_list_file_path=None):

env = {