build/android/pylib/instrumentation/instrumentation_test_instance.py - Issue 2583933003: Replace deprecated Android java test annotations

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 2583933003: Replace deprecated Android java test annotations (Closed)

Patch Set: Rebase again :( Created 4 years 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 | « blimp/client/app/android/javatests/src/org/chromium/blimp/core/settings/BlimpPreferencesTest.java ('k') | build/android/pylib/results/report_results.py » ('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 8bfe4b3f30dfc9bd0bdd1ec0f52872b8afdaa3c7..ce28c440d6f7a73899b34c41a6e3af076567b725 100644

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

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

@@ -30,8 +30,7 @@ _ACTIVITY_RESULT_OK = -1

_COMMAND_LINE_PARAMETER = 'cmdlinearg-parameter'

_DEFAULT_ANNOTATIONS = [

- 'Smoke', 'SmallTest', 'MediumTest', 'LargeTest',

- 'EnormousTest', 'IntegrationTest']

+ 'SmallTest', 'MediumTest', 'LargeTest', 'EnormousTest', 'IntegrationTest']

_EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS = [

'DisabledTest', 'FlakyTest']

_VALID_ANNOTATIONS = set(['Manual', 'PerfTest'] + _DEFAULT_ANNOTATIONS +