| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 logging | 5 import logging |
| 6 import os | 6 import os |
| 7 import re | 7 import re |
| 8 import tempfile | 8 import tempfile |
| 9 | 9 |
| 10 from devil.android import apk_helper | 10 from devil.android import apk_helper |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 # crbug.com/258690 | 70 # crbug.com/258690 |
| 71 'webkit/data/bmp_decoder', | 71 'webkit/data/bmp_decoder', |
| 72 'webkit/data/ico_decoder', | 72 'webkit/data/ico_decoder', |
| 73 ] | 73 ] |
| 74 | 74 |
| 75 | 75 |
| 76 _EXTRA_NATIVE_TEST_ACTIVITY = ( | 76 _EXTRA_NATIVE_TEST_ACTIVITY = ( |
| 77 'org.chromium.native_test.NativeTestInstrumentationTestRunner.' | 77 'org.chromium.native_test.NativeTestInstrumentationTestRunner.' |
| 78 'NativeTestActivity') | 78 'NativeTestActivity') |
| 79 _EXTRA_RUN_IN_SUB_THREAD = ( | 79 _EXTRA_RUN_IN_SUB_THREAD = ( |
| 80 'org.chromium.native_test.NativeTestActivity.RunInSubThread') | 80 'org.chromium.native_test.NativeTest.RunInSubThread') |
| 81 EXTRA_SHARD_NANO_TIMEOUT = ( | 81 EXTRA_SHARD_NANO_TIMEOUT = ( |
| 82 'org.chromium.native_test.NativeTestInstrumentationTestRunner.' | 82 'org.chromium.native_test.NativeTestInstrumentationTestRunner.' |
| 83 'ShardNanoTimeout') | 83 'ShardNanoTimeout') |
| 84 _EXTRA_SHARD_SIZE_LIMIT = ( | 84 _EXTRA_SHARD_SIZE_LIMIT = ( |
| 85 'org.chromium.native_test.NativeTestInstrumentationTestRunner.' | 85 'org.chromium.native_test.NativeTestInstrumentationTestRunner.' |
| 86 'ShardSizeLimit') | 86 'ShardSizeLimit') |
| 87 | 87 |
| 88 # TODO(jbudorick): Remove these once we're no longer parsing stdout to generate | 88 # TODO(jbudorick): Remove these once we're no longer parsing stdout to generate |
| 89 # results. | 89 # results. |
| 90 _RE_TEST_STATUS = re.compile( | 90 _RE_TEST_STATUS = re.compile( |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 result_type = None | 398 result_type = None |
| 399 | 399 |
| 400 return results | 400 return results |
| 401 | 401 |
| 402 #override | 402 #override |
| 403 def TearDown(self): | 403 def TearDown(self): |
| 404 """Clear the mappings created by SetUp.""" | 404 """Clear the mappings created by SetUp.""" |
| 405 if self._isolate_delegate: | 405 if self._isolate_delegate: |
| 406 self._isolate_delegate.Clear() | 406 self._isolate_delegate.Clear() |
| 407 | 407 |
| OLD | NEW |