Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: build/android/pylib/base_test_runner.py

Issue 10885005: Upstream chrome_test_server_spawner.py for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Marcus' comments Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build/android/pylib/chrome_test_server_spawner.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 import contextlib 5 import contextlib
6 import httplib 6 import httplib
7 import logging 7 import logging
8 import os 8 import os
9 import tempfile 9 import tempfile
10 import time 10 import time
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 def LaunchChromeTestServerSpawner(self): 208 def LaunchChromeTestServerSpawner(self):
209 """Launches test server spawner.""" 209 """Launches test server spawner."""
210 server_ready = False 210 server_ready = False
211 error_msgs = [] 211 error_msgs = []
212 # Try 3 times to launch test spawner server. 212 # Try 3 times to launch test spawner server.
213 for i in xrange(0, 3): 213 for i in xrange(0, 3):
214 # Do not allocate port for test server here. We will allocate 214 # Do not allocate port for test server here. We will allocate
215 # different port for individual test in TestServerThread. 215 # different port for individual test in TestServerThread.
216 self.test_server_spawner_port = ports.AllocateTestServerPort() 216 self.test_server_spawner_port = ports.AllocateTestServerPort()
217 self._spawning_server = SpawningServer(self.test_server_spawner_port, 217 self._spawning_server = SpawningServer(self.test_server_spawner_port,
218 self.test_server_port) 218 self.adb,
219 self.tool,
220 self.build_type)
219 self._spawning_server.Start() 221 self._spawning_server.Start()
220 server_ready, error_msg = ports.IsHttpServerConnectable( 222 server_ready, error_msg = ports.IsHttpServerConnectable(
221 '127.0.0.1', self.test_server_spawner_port, path='/ping', 223 '127.0.0.1', self.test_server_spawner_port, path='/ping',
222 expected_read='ready') 224 expected_read='ready')
223 if server_ready: 225 if server_ready:
224 break 226 break
225 else: 227 else:
226 error_msgs.append(error_msg) 228 error_msgs.append(error_msg)
227 self._spawning_server.Stop() 229 self._spawning_server.Stop()
228 # Wait for 2 seconds then restart. 230 # Wait for 2 seconds then restart.
229 time.sleep(2) 231 time.sleep(2)
230 if not server_ready: 232 if not server_ready:
231 logging.error(';'.join(error_msgs)) 233 logging.error(';'.join(error_msgs))
232 raise Exception('Can not start the test spawner server.') 234 raise Exception('Can not start the test spawner server.')
233 self._PushTestServerPortInfoToDevice() 235 self._PushTestServerPortInfoToDevice()
234 self._spawner_forwarder = Forwarder( 236 self._spawner_forwarder = Forwarder(
235 self.adb, 237 self.adb,
236 [(self.test_server_spawner_port, self.test_server_spawner_port)], 238 [(self.test_server_spawner_port, self.test_server_spawner_port)],
237 self.tool, '127.0.0.1', self.build_type) 239 self.tool, '127.0.0.1', self.build_type)
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/chrome_test_server_spawner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698