build/android/pylib/gtest/test_runner.py - Issue 294113003: [Android] Convert to DeviceUtils versions of WaitUntilFullyBooted and GetExternalStoragePath.

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/gtest/test_runner.py

Issue 294113003: [Android] Convert to DeviceUtils versions of WaitUntilFullyBooted and GetExternalStoragePath. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: build/android/pylib/gtest/test_runner.py

diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py

index 3e37f23fdabc8960262b6adedea0c86f33bf319a..dd0948827643be3085b9c94ba2672dac48671a4b 100644

--- a/build/android/pylib/gtest/test_runner.py

+++ b/build/android/pylib/gtest/test_runner.py

@@ -61,14 +61,15 @@ class TestRunner(base_test_runner.BaseTestRunner):

#override

def PushDataDeps(self):

- self.device.old_interface.WaitForSdCardReady(20)

+ self.device.WaitUntilFullyBooted(timeout=20)

self.tool.CopyFiles()

if os.path.exists(constants.ISOLATE_DEPS_DIR):

- device_dir = self.device.old_interface.GetExternalStorage()

# TODO(frankf): linux_dumper_unittest_helper needs to be in the same dir

# as breakpad_unittests exe. Find a better way to do this.

if self.test_package.suite_name == 'breakpad_unittests':

device_dir = constants.TEST_EXECUTABLE_DIR

+ else:

+ device_dir = self.device.GetExternalStoragePath()

for p in os.listdir(constants.ISOLATE_DEPS_DIR):

self.device.old_interface.PushIfNeeded(

os.path.join(constants.ISOLATE_DEPS_DIR, p),

« no previous file with comments | « build/android/pylib/gtest/test_package_exe.py ('k') | build/android/pylib/instrumentation/test_runner.py » ('j') | no next file with comments »