OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 """Class for running instrumentation tests on a single device.""" | 5 """Class for running instrumentation tests on a single device.""" |
6 | 6 |
7 import logging | 7 import logging |
8 import os | 8 import os |
9 import re | 9 import re |
10 import sys | 10 import sys |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 super(TestRunner, self).SetUp() | 93 super(TestRunner, self).SetUp() |
94 if not self.device.HasRoot(): | 94 if not self.device.HasRoot(): |
95 logging.warning('Unable to enable java asserts for %s, non rooted device', | 95 logging.warning('Unable to enable java asserts for %s, non rooted device', |
96 str(self.device)) | 96 str(self.device)) |
97 else: | 97 else: |
98 if self.device.SetJavaAsserts(self.options.set_asserts): | 98 if self.device.SetJavaAsserts(self.options.set_asserts): |
99 # TODO(jbudorick) How to best do shell restart after the | 99 # TODO(jbudorick) How to best do shell restart after the |
100 # android_commands refactor? | 100 # android_commands refactor? |
101 self.device.RunShellCommand('stop') | 101 self.device.RunShellCommand('stop') |
102 self.device.RunShellCommand('start') | 102 self.device.RunShellCommand('start') |
| 103 self.device.WaitUntilFullyBooted() |
103 | 104 |
104 # We give different default value to launch HTTP server based on shard index | 105 # We give different default value to launch HTTP server based on shard index |
105 # because it may have race condition when multiple processes are trying to | 106 # because it may have race condition when multiple processes are trying to |
106 # launch lighttpd with same port at same time. | 107 # launch lighttpd with same port at same time. |
107 self.LaunchTestHttpServer( | 108 self.LaunchTestHttpServer( |
108 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port) | 109 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port) |
109 if self.flags: | 110 if self.flags: |
110 self.flags.AddFlags(['--disable-fre', '--enable-test-intents']) | 111 self.flags.AddFlags(['--disable-fre', '--enable-test-intents']) |
111 if self.options.device_flags: | 112 if self.options.device_flags: |
112 with open(self.options.device_flags) as device_flags_file: | 113 with open(self.options.device_flags) as device_flags_file: |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 except device_errors.CommandTimeoutError as e: | 360 except device_errors.CommandTimeoutError as e: |
360 results.AddResult(test_result.InstrumentationTestResult( | 361 results.AddResult(test_result.InstrumentationTestResult( |
361 test, base_test_result.ResultType.TIMEOUT, start_ms, duration_ms, | 362 test, base_test_result.ResultType.TIMEOUT, start_ms, duration_ms, |
362 log=str(e) or 'No information')) | 363 log=str(e) or 'No information')) |
363 except device_errors.DeviceUnreachableError as e: | 364 except device_errors.DeviceUnreachableError as e: |
364 results.AddResult(test_result.InstrumentationTestResult( | 365 results.AddResult(test_result.InstrumentationTestResult( |
365 test, base_test_result.ResultType.CRASH, start_ms, duration_ms, | 366 test, base_test_result.ResultType.CRASH, start_ms, duration_ms, |
366 log=str(e) or 'No information')) | 367 log=str(e) or 'No information')) |
367 self.TestTeardown(test, results) | 368 self.TestTeardown(test, results) |
368 return (results, None if results.DidRunPass() else test) | 369 return (results, None if results.DidRunPass() else test) |
OLD | NEW |