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

Side by Side Diff: build/android/pylib/instrumentation/instrumentation_test_instance.py

Issue 2583933003: Replace deprecated Android java test annotations (Closed)

Patch Set: Rebase again :( Created 3 years, 12 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:

« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 # Copyright 2015 The Chromium Authors. All rights reserved.	1 # Copyright 2015 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 import collections	5 import collections

6 import copy	6 import copy

7 import logging	7 import logging

8 import os	8 import os

9 import pickle	9 import pickle

10 import re	10 import re

(...skipping 12 matching lines...) Expand all Loading...
23	23

24 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):	24 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):

25 import unittest_util # pylint: disable=import-error	25 import unittest_util # pylint: disable=import-error

26	26

27 # Ref: http://developer.android.com/reference/android/app/Activity.html	27 # Ref: http://developer.android.com/reference/android/app/Activity.html

28 _ACTIVITY_RESULT_CANCELED = 0	28 _ACTIVITY_RESULT_CANCELED = 0

29 _ACTIVITY_RESULT_OK = -1	29 _ACTIVITY_RESULT_OK = -1

30	30

31 _COMMAND_LINE_PARAMETER = 'cmdlinearg-parameter'	31 _COMMAND_LINE_PARAMETER = 'cmdlinearg-parameter'

32 _DEFAULT_ANNOTATIONS = [	32 _DEFAULT_ANNOTATIONS = [

33 'Smoke', 'SmallTest', 'MediumTest', 'LargeTest',	33 'SmallTest', 'MediumTest', 'LargeTest', 'EnormousTest', 'IntegrationTest']

34 'EnormousTest', 'IntegrationTest']

35 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS = [	34 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS = [

36 'DisabledTest', 'FlakyTest']	35 'DisabledTest', 'FlakyTest']

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

38 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS)	37 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS)

39 _EXTRA_DRIVER_TEST_LIST = (	38 _EXTRA_DRIVER_TEST_LIST = (

40 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestList')	39 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestList')

41 _EXTRA_DRIVER_TEST_LIST_FILE = (	40 _EXTRA_DRIVER_TEST_LIST_FILE = (

42 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestListFile')	41 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestListFile')

43 _EXTRA_DRIVER_TARGET_PACKAGE = (	42 _EXTRA_DRIVER_TARGET_PACKAGE = (

44 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetPackage')	43 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetPackage')

(...skipping 759 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
804	803

805 @staticmethod	804 @staticmethod

806 def GenerateTestResults(	805 def GenerateTestResults(

807 result_code, result_bundle, statuses, start_ms, duration_ms):	806 result_code, result_bundle, statuses, start_ms, duration_ms):

808 return GenerateTestResults(result_code, result_bundle, statuses,	807 return GenerateTestResults(result_code, result_bundle, statuses,

809 start_ms, duration_ms)	808 start_ms, duration_ms)

810	809

811 #override	810 #override

812 def TearDown(self):	811 def TearDown(self):

813 pass	812 pass

OLD	NEW