| 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 """Base class for running tests on a single device.""" | 5 """Base class for running tests on a single device.""" |
| 6 | 6 |
| 7 import contextlib | 7 import contextlib |
| 8 import httplib | 8 import httplib |
| 9 import logging | 9 import logging |
| 10 import os | 10 import os |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 self._http_server.port) | 141 self._http_server.port) |
| 142 else: | 142 else: |
| 143 logging.critical('Failed to start http server') | 143 logging.critical('Failed to start http server') |
| 144 self.StartForwarderForHttpServer() | 144 self.StartForwarderForHttpServer() |
| 145 return (self._forwarder_device_port, self._http_server.port) | 145 return (self._forwarder_device_port, self._http_server.port) |
| 146 | 146 |
| 147 def _ForwardPort(self, port_pairs): | 147 def _ForwardPort(self, port_pairs): |
| 148 """Creates a forwarder instance if needed and forward a port.""" | 148 """Creates a forwarder instance if needed and forward a port.""" |
| 149 if not self._forwarder: | 149 if not self._forwarder: |
| 150 self._forwarder = Forwarder(self.adb, self.build_type) | 150 self._forwarder = Forwarder(self.adb, self.build_type) |
| 151 self._forwarder.Run(port_pairs, self.tool, '127.0.0.1') | 151 self._forwarder.Run(port_pairs, self.tool) |
| 152 | 152 |
| 153 def StartForwarder(self, port_pairs): | 153 def StartForwarder(self, port_pairs): |
| 154 """Starts TCP traffic forwarding for the given |port_pairs|. | 154 """Starts TCP traffic forwarding for the given |port_pairs|. |
| 155 | 155 |
| 156 Args: | 156 Args: |
| 157 host_port_pairs: A list of (device_port, local_port) tuples to forward. | 157 host_port_pairs: A list of (device_port, local_port) tuples to forward. |
| 158 """ | 158 """ |
| 159 self._ForwardPort(port_pairs) | 159 self._ForwardPort(port_pairs) |
| 160 | 160 |
| 161 def StartForwarderForHttpServer(self): | 161 def StartForwarderForHttpServer(self): |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 break | 223 break |
| 224 else: | 224 else: |
| 225 error_msgs.append(error_msg) | 225 error_msgs.append(error_msg) |
| 226 self._spawning_server.Stop() | 226 self._spawning_server.Stop() |
| 227 # Wait for 2 seconds then restart. | 227 # Wait for 2 seconds then restart. |
| 228 time.sleep(2) | 228 time.sleep(2) |
| 229 if not server_ready: | 229 if not server_ready: |
| 230 logging.error(';'.join(error_msgs)) | 230 logging.error(';'.join(error_msgs)) |
| 231 raise Exception('Can not start the test spawner server.') | 231 raise Exception('Can not start the test spawner server.') |
| 232 self._PushTestServerPortInfoToDevice() | 232 self._PushTestServerPortInfoToDevice() |
| OLD | NEW |