Chromium Code Reviews| Index: build/android/pylib/chrome_test_server_spawner.py |
| diff --git a/build/android/pylib/chrome_test_server_spawner.py b/build/android/pylib/chrome_test_server_spawner.py |
| index 642e5223eaf6df06575b64f91a25e9e9bf316ac6..9d612bb9ff3e74e85c1c0c62bf63c23f0cc0f6ec 100644 |
| --- a/build/android/pylib/chrome_test_server_spawner.py |
| +++ b/build/android/pylib/chrome_test_server_spawner.py |
| @@ -20,8 +20,8 @@ import threading |
| import time |
| import urlparse |
| -import constants |
| -import ports |
| +from . import constants |
| +from . import ports |
| from pylib.forwarder import Forwarder |
| @@ -54,7 +54,7 @@ def _WaitUntil(predicate, max_attempts=5): |
| Whether the provided predicate was satisfied once (before the timeout). |
| """ |
| sleep_time_sec = 0.025 |
| - for attempt in xrange(1, max_attempts): |
| + for _ in xrange(1, max_attempts): |
| if predicate(): |
| return True |
| time.sleep(sleep_time_sec) |
| @@ -126,6 +126,7 @@ class TestServerThread(threading.Thread): |
| # Anonymous pipe in order to get port info from test server. |
| self.pipe_in = None |
| self.pipe_out = None |
| + self.process = None |
| self.command_line = [] |
| def _WaitToStartAndGetPortFromTestServer(self): |
| @@ -263,7 +264,6 @@ class TestServerThread(threading.Thread): |
| if self.process.poll() is None: |
| self.process.kill() |
| Forwarder.UnmapDevicePort(self.forwarder_device_port, self.adb) |
| - self.process = None |
|
frankf
2014/02/03 18:58:51
can't you call run multiple times on the same obje
jbudorick
2014/02/03 19:33:57
Done.
|
| self.is_ready = False |
| if self.pipe_out: |
| os.close(self.pipe_in) |