| 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 self.device.old_interface.TakeScreenshot(screenshot_name) | 145 self.device.old_interface.TakeScreenshot(screenshot_name) |
| 146 | 146 |
| 147 def SetUp(self): | 147 def SetUp(self): |
| 148 """Sets up the test harness and device before all tests are run.""" | 148 """Sets up the test harness and device before all tests are run.""" |
| 149 super(TestRunner, self).SetUp() | 149 super(TestRunner, self).SetUp() |
| 150 if not self.device.HasRoot(): | 150 if not self.device.HasRoot(): |
| 151 logging.warning('Unable to enable java asserts for %s, non rooted device', | 151 logging.warning('Unable to enable java asserts for %s, non rooted device', |
| 152 str(self.device)) | 152 str(self.device)) |
| 153 else: | 153 else: |
| 154 if self.device.old_interface.SetJavaAssertsEnabled(True): | 154 if self.device.old_interface.SetJavaAssertsEnabled(True): |
| 155 self.device.old_interface.Reboot(full_reboot=False) | 155 # TODO(jbudorick) How to best do shell restart after the |
| 156 # android_commands refactor? |
| 157 self.device.old_interface.RunShellCommand('stop') |
| 158 self.device.old_interface.RunShellCommand('start') |
| 156 | 159 |
| 157 # We give different default value to launch HTTP server based on shard index | 160 # We give different default value to launch HTTP server based on shard index |
| 158 # because it may have race condition when multiple processes are trying to | 161 # because it may have race condition when multiple processes are trying to |
| 159 # launch lighttpd with same port at same time. | 162 # launch lighttpd with same port at same time. |
| 160 self.LaunchTestHttpServer( | 163 self.LaunchTestHttpServer( |
| 161 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port) | 164 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port) |
| 162 if self.flags: | 165 if self.flags: |
| 163 self.flags.AddFlags(['--disable-fre', '--enable-test-intents']) | 166 self.flags.AddFlags(['--disable-fre', '--enable-test-intents']) |
| 164 | 167 |
| 165 def TearDown(self): | 168 def TearDown(self): |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 duration_ms = 0 | 386 duration_ms = 0 |
| 384 message = str(e) | 387 message = str(e) |
| 385 if not message: | 388 if not message: |
| 386 message = 'No information.' | 389 message = 'No information.' |
| 387 results.AddResult(test_result.InstrumentationTestResult( | 390 results.AddResult(test_result.InstrumentationTestResult( |
| 388 test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms, | 391 test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms, |
| 389 log=message)) | 392 log=message)) |
| 390 raw_result = None | 393 raw_result = None |
| 391 self.TestTeardown(test, raw_result) | 394 self.TestTeardown(test, raw_result) |
| 392 return (results, None if results.DidRunPass() else test) | 395 return (results, None if results.DidRunPass() else test) |
| OLD | NEW |