| 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..43405876a1f86b0d5f03bd098d268a35963339f0 100644
|
| --- a/build/android/pylib/chrome_test_server_spawner.py
|
| +++ b/build/android/pylib/chrome_test_server_spawner.py
|
| @@ -7,6 +7,7 @@
|
| It's used to accept requests from the device to spawn and kill instances of the
|
| chrome test server on the host.
|
| """
|
| +# pylint: disable=W0702
|
|
|
| import BaseHTTPServer
|
| import json
|
| @@ -20,11 +21,12 @@ import threading
|
| import time
|
| import urlparse
|
|
|
| -import constants
|
| -import ports
|
| +from pylib import constants
|
| +from pylib import ports
|
|
|
| from pylib.forwarder import Forwarder
|
|
|
| +
|
| # Path that are needed to import necessary modules when launching a testserver.
|
| os.environ['PYTHONPATH'] = os.environ.get('PYTHONPATH', '') + (':%s:%s:%s:%s:%s'
|
| % (os.path.join(constants.DIR_SOURCE_ROOT, 'third_party'),
|
| @@ -54,7 +56,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 +128,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):
|
|
|