| 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 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH): | 23 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH): |
| 24 import unittest_util # pylint: disable=import-error | 24 import unittest_util # pylint: disable=import-error |
| 25 | 25 |
| 26 # Ref: http://developer.android.com/reference/android/app/Activity.html | 26 # Ref: http://developer.android.com/reference/android/app/Activity.html |
| 27 _ACTIVITY_RESULT_CANCELED = 0 | 27 _ACTIVITY_RESULT_CANCELED = 0 |
| 28 _ACTIVITY_RESULT_OK = -1 | 28 _ACTIVITY_RESULT_OK = -1 |
| 29 | 29 |
| 30 _COMMAND_LINE_PARAMETER = 'cmdlinearg-parameter' | 30 _COMMAND_LINE_PARAMETER = 'cmdlinearg-parameter' |
| 31 _DEFAULT_ANNOTATIONS = [ | 31 _DEFAULT_ANNOTATIONS = [ |
| 32 'Smoke', 'SmallTest', 'MediumTest', 'LargeTest', | 32 'Smoke', 'SmallTest', 'MediumTest', 'LargeTest', |
| 33 'EnormousTest', 'IntegrationTest'] | 33 'EnormousTest', 'IntegrationTest', 'RenderTest'] |
| 34 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS = [ | 34 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS = [ |
| 35 'DisabledTest', 'FlakyTest'] | 35 'DisabledTest', 'FlakyTest'] |
| 36 _VALID_ANNOTATIONS = set(['Manual', 'PerfTest'] + _DEFAULT_ANNOTATIONS + | 36 _VALID_ANNOTATIONS = set(['Manual', 'PerfTest'] + _DEFAULT_ANNOTATIONS + |
| 37 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS) | 37 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS) |
| 38 _EXTRA_DRIVER_TEST_LIST = ( | 38 _EXTRA_DRIVER_TEST_LIST = ( |
| 39 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestList') | 39 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestList') |
| 40 _EXTRA_DRIVER_TEST_LIST_FILE = ( | 40 _EXTRA_DRIVER_TEST_LIST_FILE = ( |
| 41 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestListFile') | 41 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestListFile') |
| 42 _EXTRA_DRIVER_TARGET_PACKAGE = ( | 42 _EXTRA_DRIVER_TARGET_PACKAGE = ( |
| 43 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetPackage') | 43 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetPackage') |
| (...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 @staticmethod | 701 @staticmethod |
| 702 def GenerateTestResults( | 702 def GenerateTestResults( |
| 703 result_code, result_bundle, statuses, start_ms, duration_ms): | 703 result_code, result_bundle, statuses, start_ms, duration_ms): |
| 704 return GenerateTestResults(result_code, result_bundle, statuses, | 704 return GenerateTestResults(result_code, result_bundle, statuses, |
| 705 start_ms, duration_ms) | 705 start_ms, duration_ms) |
| 706 | 706 |
| 707 #override | 707 #override |
| 708 def TearDown(self): | 708 def TearDown(self): |
| 709 if self._isolate_delegate: | 709 if self._isolate_delegate: |
| 710 self._isolate_delegate.Clear() | 710 self._isolate_delegate.Clear() |
| OLD | NEW |