build/android/pylib/instrumentation/instrumentation_test_instance.py - Issue 1422433007: Align handling of ParameterizedTest annotations in Java and Python code

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

Issue 1422433007: Align handling of ParameterizedTest annotations in Java and Python code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Comments addressed Created 5 years, 1 month 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

« no previous file with comments | « base/test/android/javatests/src/org/chromium/base/test/util/parameter/Parameter.java ('k') | chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestAnnotationTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f3c3d3c0891e4b002f9538774a849b1b5b8c1825..278ffb2f7212efa6c25b77ebacf39a202db183d6 100644

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

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

@@ -163,12 +163,12 @@ def ParseCommandLineFlagParameters(annotations):

"""

ParamsTuple = collections.namedtuple('ParamsTuple', ['add', 'remove'])

parameterized_tests = []

- if _PARAMETERIZED_TEST_ANNOTATION in annotations:

- parameterized_tests = [annotations[_PARAMETERIZED_TEST_ANNOTATION]]

- elif _PARAMETERIZED_TEST_SET_ANNOTATION in annotations:

+ if _PARAMETERIZED_TEST_SET_ANNOTATION in annotations:

if annotations[_PARAMETERIZED_TEST_SET_ANNOTATION]:

parameterized_tests = annotations[

_PARAMETERIZED_TEST_SET_ANNOTATION].get('tests', [])

+ elif _PARAMETERIZED_TEST_ANNOTATION in annotations:

+ parameterized_tests = [annotations[_PARAMETERIZED_TEST_ANNOTATION]]

else:

return None