build/android/pylib/instrumentation/test_jar.py - Issue 19537004: [Android] Converts host driven tests to common test_dispatcher

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/instrumentation/test_jar.py

Issue 19537004: [Android] Converts host driven tests to common test_dispatcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sharding_refactoring

Patch Set: Adds tagging of host-driven, re-adds exception handling Created 7 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:

View side-by-side diff with in-line comments

Download patch

« build/android/pylib/host_driven/test_runner.py ('K') | « build/android/pylib/host_driven/tests_annotations.py ('k') | build/android/pylib/utils/run_tests_helper.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/instrumentation/test_jar.py

diff --git a/build/android/pylib/instrumentation/test_jar.py b/build/android/pylib/instrumentation/test_jar.py

index e582a1d752d2750480646b2889c1444cb86ded0c..fc0865dc2c9ab05ce9f32decfbf6d2705a6eb147 100644

--- a/build/android/pylib/instrumentation/test_jar.py

+++ b/build/android/pylib/instrumentation/test_jar.py

@@ -169,7 +169,7 @@ class TestJar(object):

for test_method in self.GetTestMethods():

annotations_ = frozenset(self.GetTestAnnotations(test_method))

if (annotations_.isdisjoint(self._ANNOTATIONS) and

- not self.IsPythonDrivenTest(test_method)):

+ not self.IsHostDrivenTest(test_method)):

tests_missing_annotations.append(test_method)

return sorted(tests_missing_annotations)

@@ -202,7 +202,7 @@ class TestJar(object):

available_tests = list(set(available_tests) - set(excluded_tests))

else:

available_tests = [m for m in self.GetTestMethods()

- if not self.IsPythonDrivenTest(m)]

+ if not self.IsHostDrivenTest(m)]

tests = []

if test_filter:

@@ -216,5 +216,5 @@ class TestJar(object):

return tests

@staticmethod

- def IsPythonDrivenTest(test):

+ def IsHostDrivenTest(test):

frankf 2013/07/25 22:50:06 Why does this need to be in test_jar.py? Let's add

gkanwar1 2013/07/26 01:39:06 sgtm

return 'pythonDrivenTests' in test