build/android/pylib/single_test_runner.py - Issue 10736049: Android: move functions added in third_party to android_commands.

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

Issue 10736049: Android: move functions added in third_party to android_commands. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Only restart adb server if running on emulator Created 8 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:

Index: build/android/pylib/single_test_runner.py

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

index f1ee76f583fe5835b376fa2018fef5af61fc1bdb..35d5a94bb6c9df6b2bfeae6c22d746247a390c30 100644

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

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

@@ -312,9 +312,10 @@ class SingleTestRunner(BaseTestRunner):

"""Sets up necessary test enviroment for the test suite."""

super(SingleTestRunner, self).SetUp()

self.adb.ClearApplicationState(constants.CHROME_PACKAGE)

- # Sometimes adb server lost connection to the emulator, which will break the

- # test, so restart the adb server before the test.

- self.adb.Adb().RestartAdbServer()

+ if self._running_on_emulator:

+ # Sometimes adb server lost connection to the emulator, which will break

+ # the test, so restart the adb server before the test.

+ self.adb.RestartAdbServer()

if self.test_package.performance_test:

self.adb.SetupPerformanceTest()

if self.dump_debug_info: