build/android/pylib/instrumentation/instrumentation_test_instance.py - Issue 1218053003: [Android] Begin switching from lighttpd + apache to 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 1218053003: [Android] Begin switching from lighttpd + apache to EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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

« no previous file with comments | « base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java ('k') | build/android/pylib/local/device/local_device_instrumentation_test_run.py » ('j') | no next file with comments »
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 f9957b089cba82cff6d24aff34d3d2011fe5f63c..bbe2416ecf5e976163314cafade8b912e9829988 100644

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

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

@@ -30,9 +30,6 @@ _ACTIVITY_RESULT_OK = -1

_DEFAULT_ANNOTATIONS = [

'Smoke', 'SmallTest', 'MediumTest', 'LargeTest',

'EnormousTest', 'IntegrationTest']

-_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 = (

@@ -486,12 +483,6 @@ class InstrumentationTestInstance(test_instance.TestInstance):

})

return inflated_tests

- @staticmethod

- def GetHttpServerEnvironmentVars():

- return {

- _EXTRA_ENABLE_HTTP_SERVER: None,

- }

def GetDriverEnvironmentVars(

self, test_list=None, test_list_file_path=None):

env = {