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 | 5 |
6 import logging | 6 import logging |
7 import os | 7 import os |
8 | 8 |
9 from pylib import constants | 9 from pylib import constants |
10 from pylib import ports | 10 from pylib import ports |
(...skipping 12 matching lines...) Expand all Loading... |
23 _EXTRA_COMMAND_LINE_FILE = ( | 23 _EXTRA_COMMAND_LINE_FILE = ( |
24 'org.chromium.native_test.ChromeNativeTestActivity.CommandLineFile') | 24 'org.chromium.native_test.ChromeNativeTestActivity.CommandLineFile') |
25 _EXTRA_COMMAND_LINE_FLAGS = ( | 25 _EXTRA_COMMAND_LINE_FLAGS = ( |
26 'org.chromium.native_test.ChromeNativeTestActivity.CommandLineFlags') | 26 'org.chromium.native_test.ChromeNativeTestActivity.CommandLineFlags') |
27 | 27 |
28 _MAX_SHARD_SIZE = 256 | 28 _MAX_SHARD_SIZE = 256 |
29 | 29 |
30 # TODO(jbudorick): Move this up to the test instance if the net test server is | 30 # TODO(jbudorick): Move this up to the test instance if the net test server is |
31 # handled outside of the APK for the remote_device environment. | 31 # handled outside of the APK for the remote_device environment. |
32 _SUITE_REQUIRES_TEST_SERVER_SPAWNER = [ | 32 _SUITE_REQUIRES_TEST_SERVER_SPAWNER = [ |
33 'content_unittests', 'content_browsertests', 'net_unittests', 'unit_tests' | 33 'components_browsertests', 'content_unittests', 'content_browsertests', |
| 34 'net_unittests', 'unit_tests' |
34 ] | 35 ] |
35 | 36 |
36 class _ApkDelegate(object): | 37 class _ApkDelegate(object): |
37 def __init__(self, apk): | 38 def __init__(self, apk): |
38 self._apk = apk | 39 self._apk = apk |
39 self._package = apk_helper.GetPackageName(self._apk) | 40 self._package = apk_helper.GetPackageName(self._apk) |
40 self._runner = apk_helper.GetInstrumentationName(self._apk) | 41 self._runner = apk_helper.GetInstrumentationName(self._apk) |
41 self._component = '%s/%s' % (self._package, self._runner) | 42 self._component = '%s/%s' % (self._package, self._runner) |
42 self._enable_test_server_spawner = False | 43 self._enable_test_server_spawner = False |
43 | 44 |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 return results | 197 return results |
197 | 198 |
198 #override | 199 #override |
199 def TearDown(self): | 200 def TearDown(self): |
200 def individual_device_tear_down(dev): | 201 def individual_device_tear_down(dev): |
201 for s in self._servers[str(dev)]: | 202 for s in self._servers[str(dev)]: |
202 s.TearDown() | 203 s.TearDown() |
203 | 204 |
204 self._env.parallel_devices.pMap(individual_device_tear_down) | 205 self._env.parallel_devices.pMap(individual_device_tear_down) |
205 | 206 |
OLD | NEW |