Chromium Code Reviews| Index: build/android/pylib/base/base_test_runner.py |
| diff --git a/build/android/pylib/base/base_test_runner.py b/build/android/pylib/base/base_test_runner.py |
| index cfd0c6c75a3c107099be5741edf8ea510427868f..dc9992367ab12c6c3071bda4d23751a07a0bdaaf 100644 |
| --- a/build/android/pylib/base/base_test_runner.py |
| +++ b/build/android/pylib/base/base_test_runner.py |
| @@ -115,7 +115,7 @@ class BaseTestRunner(object): |
| self._http_server.port) |
| else: |
| logging.critical('Failed to start http server') |
| - self._ForwardPortsForHttpServer() |
| + #self._ForwardPortsForHttpServer() |
| return (self._forwarder_device_port, self._http_server.port) |
| def _ForwardPorts(self, port_pairs): |
| @@ -149,6 +149,7 @@ class BaseTestRunner(object): |
| # request. |
| # TODO(dtrainor): This is not always reliable because sometimes the port |
| # will be left open even after the forwarder has been killed. |
| + return |
|
benm (inactive)
2014/07/23 01:09:40
is this right?
mkosiba (inactive)
2014/07/24 16:08:28
accident. reverted.
|
| if not ports.IsDevicePortUsed(self.device, self._forwarder_device_port): |
| self._ForwardPortsForHttpServer() |
| @@ -177,6 +178,7 @@ class BaseTestRunner(object): |
| # well as IsHttpServerConnectable(). spawning_server.Start() should also |
| # block until the server is ready. |
| # Try 3 times to launch test spawner server. |
| + return |
| for _ in xrange(0, 3): |
| self.test_server_spawner_port = ports.AllocateTestServerPort() |
| self._ForwardPorts( |