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 shutil | 8 import shutil |
9 import sys | 9 import sys |
10 import tempfile | 10 import tempfile |
11 | 11 |
| 12 from devil.android import apk_helper |
12 from pylib import constants | 13 from pylib import constants |
13 from pylib.base import base_test_result | 14 from pylib.base import base_test_result |
14 from pylib.base import test_instance | 15 from pylib.base import test_instance |
15 from pylib.utils import apk_helper | |
16 | 16 |
17 sys.path.append(os.path.join( | 17 sys.path.append(os.path.join( |
18 constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib', 'common')) | 18 constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib', 'common')) |
19 import unittest_util | 19 import unittest_util |
20 | 20 |
21 | 21 |
22 BROWSER_TEST_SUITES = [ | 22 BROWSER_TEST_SUITES = [ |
23 'components_browsertests', | 23 'components_browsertests', |
24 'content_browsertests', | 24 'content_browsertests', |
25 ] | 25 ] |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 return self._package | 320 return self._package |
321 | 321 |
322 @property | 322 @property |
323 def runner(self): | 323 def runner(self): |
324 return self._runner | 324 return self._runner |
325 | 325 |
326 @property | 326 @property |
327 def suite(self): | 327 def suite(self): |
328 return self._suite | 328 return self._suite |
329 | 329 |
OLD | NEW |