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 itertools | 5 import itertools |
6 import logging | 6 import logging |
7 import os | 7 import os |
8 import posixpath | 8 import posixpath |
9 | 9 |
| 10 from devil.android import device_errors |
| 11 from devil.android import device_temp_file |
| 12 from devil.android import ports |
10 from pylib import constants | 13 from pylib import constants |
11 from pylib import ports | |
12 from pylib.base import test_run | 14 from pylib.base import test_run |
13 from pylib.device import device_errors | |
14 from pylib.gtest import gtest_test_instance | 15 from pylib.gtest import gtest_test_instance |
15 | |
16 from pylib.local import local_test_server_spawner | 16 from pylib.local import local_test_server_spawner |
17 from pylib.local.device import local_device_environment | 17 from pylib.local.device import local_device_environment |
18 from pylib.local.device import local_device_test_run | 18 from pylib.local.device import local_device_test_run |
19 from pylib.utils import device_temp_file | |
20 | 19 |
21 _COMMAND_LINE_FLAGS_SUPPORTED = True | 20 _COMMAND_LINE_FLAGS_SUPPORTED = True |
22 | 21 |
23 _EXTRA_COMMAND_LINE_FILE = ( | 22 _EXTRA_COMMAND_LINE_FILE = ( |
24 'org.chromium.native_test.NativeTestActivity.CommandLineFile') | 23 'org.chromium.native_test.NativeTestActivity.CommandLineFile') |
25 _EXTRA_COMMAND_LINE_FLAGS = ( | 24 _EXTRA_COMMAND_LINE_FLAGS = ( |
26 'org.chromium.native_test.NativeTestActivity.CommandLineFlags') | 25 'org.chromium.native_test.NativeTestActivity.CommandLineFlags') |
27 _EXTRA_TEST_LIST = ( | 26 _EXTRA_TEST_LIST = ( |
28 'org.chromium.native_test.NativeTestInstrumentationTestRunner' | 27 'org.chromium.native_test.NativeTestInstrumentationTestRunner' |
29 '.TestList') | 28 '.TestList') |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 return results | 232 return results |
234 | 233 |
235 #override | 234 #override |
236 def TearDown(self): | 235 def TearDown(self): |
237 def individual_device_tear_down(dev): | 236 def individual_device_tear_down(dev): |
238 for s in self._servers[str(dev)]: | 237 for s in self._servers[str(dev)]: |
239 s.TearDown() | 238 s.TearDown() |
240 | 239 |
241 self._env.parallel_devices.pMap(individual_device_tear_down) | 240 self._env.parallel_devices.pMap(individual_device_tear_down) |
242 | 241 |
OLD | NEW |