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 logging | 5 import logging |
6 import os | 6 import os |
7 import pickle | 7 import pickle |
8 import re | 8 import re |
9 import sys | 9 import sys |
10 | 10 |
11 from pylib import cmd_helper | 11 from devil.android import apk_helper |
| 12 from devil.android import md5sum |
| 13 from devil.utils import cmd_helper |
12 from pylib import constants | 14 from pylib import constants |
13 from pylib import flag_changer | 15 from pylib import flag_changer |
14 from pylib.base import base_test_result | 16 from pylib.base import base_test_result |
15 from pylib.base import test_instance | 17 from pylib.base import test_instance |
16 from pylib.instrumentation import test_result | 18 from pylib.instrumentation import test_result |
17 from pylib.instrumentation import instrumentation_parser | 19 from pylib.instrumentation import instrumentation_parser |
18 from pylib.utils import apk_helper | |
19 from pylib.utils import md5sum | |
20 from pylib.utils import proguard | 20 from pylib.utils import proguard |
21 | 21 |
22 sys.path.append( | 22 sys.path.append( |
23 os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib', 'common')) | 23 os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib', 'common')) |
24 import unittest_util | 24 import unittest_util |
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 |
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
516 def GenerateTestResults( | 516 def GenerateTestResults( |
517 result_code, result_bundle, statuses, start_ms, duration_ms): | 517 result_code, result_bundle, statuses, start_ms, duration_ms): |
518 return GenerateTestResults(result_code, result_bundle, statuses, | 518 return GenerateTestResults(result_code, result_bundle, statuses, |
519 start_ms, duration_ms) | 519 start_ms, duration_ms) |
520 | 520 |
521 #override | 521 #override |
522 def TearDown(self): | 522 def TearDown(self): |
523 if self._isolate_delegate: | 523 if self._isolate_delegate: |
524 self._isolate_delegate.Clear() | 524 self._isolate_delegate.Clear() |
525 | 525 |
OLD | NEW |