build/android/pylib/host_driven/test_server.py - Issue 1571803002: [Android] Prepare build/android/ for catapult+devil.

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/host_driven/test_server.py

Issue 1571803002: [Android] Prepare build/android/ for catapult+devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@create-device-library-links

Patch Set: rebase Created 4 years, 11 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 | « build/android/pylib/host_driven/test_info_collection.py ('k') | build/android/pylib/instrumentation/instrumentation_test_instance.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/host_driven/test_server.py

diff --git a/build/android/pylib/host_driven/test_server.py b/build/android/pylib/host_driven/test_server.py

index af58ddc2656548612a3fdf9c607c2db06c5a1b5a..02560c91293845fa181332298fe333e9e86baf94 100644

--- a/build/android/pylib/host_driven/test_server.py

+++ b/build/android/pylib/host_driven/test_server.py

@@ -23,6 +23,7 @@ import time

import urllib2

from pylib import constants

+from pylib.constants import host_paths

# NOTE: when adding or modifying these lines, omit any leading slashes!

# Otherwise os.path.join() will (correctly) treat them as absolute paths

@@ -87,7 +88,7 @@ class TestServer(object):

self.host = _TEST_SERVER_HOST

self.port = test_server_port + shard_index

- src_dir = constants.DIR_SOURCE_ROOT

+ src_dir = host_paths.DIR_SOURCE_ROOT

# Make dirs into a list of absolute paths.

abs_dirs = [os.path.join(src_dir, d) for d in _PYTHONPATH_DIRS]

# Add the generated python files to the path