build/android/pylib/base_test_runner.py - Issue 11038005: Enable forwarder2 for all our tests.

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

Issue 11038005: Enable forwarder2 for all our tests. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 3 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/base_test_runner.py

diff --git a/build/android/pylib/base_test_runner.py b/build/android/pylib/base_test_runner.py

index a69d0244b603a58e2472cbb47171fbf65f1fa23d..26ddc17f9a921c331f9c364640940de2026551c9 100644

--- a/build/android/pylib/base_test_runner.py

+++ b/build/android/pylib/base_test_runner.py

@@ -137,7 +137,7 @@ class BaseTestRunner(object):

# Sometimes the forwarder device port may be already used. We have to kill

# all forwarder processes to ensure that the forwarder can be started since

# currently we can not associate the specified port to related pid.

- self.adb.KillAll('forwarder')

+ self.adb.KillAll('device_forwarder')

if self._forwarder:

self._forwarder.Close()

self._forwarder = Forwarder(

@@ -168,7 +168,7 @@ class BaseTestRunner(object):

if self._forwarder or self._spawner_forwarder:

# Kill all forwarders on the device and then kill the process on the host

# (if it exists)

- self.adb.KillAll('forwarder')

+ self.adb.KillAll('device_forwarder')

if self._forwarder:

self._forwarder.Close()

if self._spawner_forwarder:

« no previous file with comments | « build/all_android.gyp ('k') | build/android/pylib/forwarder.py » ('j') | no next file with comments »