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 collections | 5 import collections |
6 import itertools | 6 import itertools |
7 import logging | 7 import logging |
8 import os | 8 import os |
9 import posixpath | 9 import posixpath |
10 | 10 |
11 from devil.android import device_errors | 11 from devil.android import device_errors |
12 from devil.android import device_temp_file | 12 from devil.android import device_temp_file |
13 from devil.android import ports | 13 from devil.android import ports |
14 from devil.utils import reraiser_thread | 14 from devil.utils import reraiser_thread |
15 from pylib import constants | 15 from pylib import constants |
16 from pylib.base import base_test_result | 16 from pylib.base import base_test_result |
17 from pylib.gtest import gtest_test_instance | 17 from pylib.gtest import gtest_test_instance |
18 from pylib.local import local_test_server_spawner | 18 from pylib.local import local_test_server_spawner |
19 from pylib.local.device import local_device_environment | 19 from pylib.local.device import local_device_environment |
20 from pylib.local.device import local_device_test_run | 20 from pylib.local.device import local_device_test_run |
21 | 21 |
22 _COMMAND_LINE_FLAGS_SUPPORTED = True | 22 _COMMAND_LINE_FLAGS_SUPPORTED = True |
23 | 23 |
24 _MAX_INLINE_FLAGS_LENGTH = 50 # Arbitrarily chosen. | 24 _MAX_INLINE_FLAGS_LENGTH = 50 # Arbitrarily chosen. |
25 _EXTRA_COMMAND_LINE_FILE = ( | 25 _EXTRA_COMMAND_LINE_FILE = ( |
26 'org.chromium.native_test.NativeTestActivity.CommandLineFile') | 26 'org.chromium.native_test.NativeTest.CommandLineFile') |
27 _EXTRA_COMMAND_LINE_FLAGS = ( | 27 _EXTRA_COMMAND_LINE_FLAGS = ( |
28 'org.chromium.native_test.NativeTestActivity.CommandLineFlags') | 28 'org.chromium.native_test.NativeTest.CommandLineFlags') |
29 _EXTRA_TEST_LIST = ( | 29 _EXTRA_TEST_LIST = ( |
30 'org.chromium.native_test.NativeTestInstrumentationTestRunner' | 30 'org.chromium.native_test.NativeTestInstrumentationTestRunner' |
31 '.TestList') | 31 '.TestList') |
32 _EXTRA_TEST = ( | 32 _EXTRA_TEST = ( |
33 'org.chromium.native_test.NativeTestInstrumentationTestRunner' | 33 'org.chromium.native_test.NativeTestInstrumentationTestRunner' |
34 '.Test') | 34 '.Test') |
35 | 35 |
36 _MAX_SHARD_SIZE = 256 | 36 _MAX_SHARD_SIZE = 256 |
37 _SECONDS_TO_NANOS = int(1e9) | 37 _SECONDS_TO_NANOS = int(1e9) |
38 | 38 |
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 def TearDown(self): | 361 def TearDown(self): |
362 @local_device_test_run.handle_shard_failures | 362 @local_device_test_run.handle_shard_failures |
363 def individual_device_tear_down(dev): | 363 def individual_device_tear_down(dev): |
364 for s in self._servers.get(str(dev), []): | 364 for s in self._servers.get(str(dev), []): |
365 s.TearDown() | 365 s.TearDown() |
366 | 366 |
367 tool = self.GetTool(dev) | 367 tool = self.GetTool(dev) |
368 tool.CleanUpEnvironment() | 368 tool.CleanUpEnvironment() |
369 | 369 |
370 self._env.parallel_devices.pMap(individual_device_tear_down) | 370 self._env.parallel_devices.pMap(individual_device_tear_down) |
OLD | NEW |