build/android/pylib/host_driven/python_test_base.py - Issue 12378048: [Android] Switch instrumentation tests to the new shard/runner paradigm.

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

Issue 12378048: [Android] Switch instrumentation tests to the new shard/runner paradigm. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add retries to the end of the queue instead of the beginning Created 7 years, 10 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/host_driven/python_test_base.py

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

index c2d0f69513d5a8c736c357116ad6005631eb6506..6d9f53107fec27c0a991a36934a8e8f2c880adaa 100644

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

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

@@ -78,9 +78,13 @@ class PythonTestBase(object):

apks = [apk_info.ApkInfo(self.options.test_apk_path,

self.options.test_apk_jar_path)]

java_test_runner = test_runner.TestRunner(self.options, self.device_id,

- [test], False, self.shard_index,

- apks, self.ports_to_forward)

- return java_test_runner.Run()

+ self.shard_index, False, apks,

+ self.ports_to_forward)

+ try:

+ java_test_runner.SetUp()

+ return java_test_runner.RunTest(test)[0]

+ finally:

+ java_test_runner.TearDown()

def _RunJavaTests(self, fname, tests):

"""Calls a list of tests and stops at the first test failure.

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