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

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

Issue 10867008: Get rid of device/host clock synchronization in android_commands.py. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Isaac's 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
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 23 matching lines...) Expand all
34 def __init__(self, device, tool, shard_index, build_type): 34 def __init__(self, device, tool, shard_index, build_type):
35 """ 35 """
36 Args: 36 Args:
37 device: Tests will run on the device of this ID. 37 device: Tests will run on the device of this ID.
38 shard_index: Index number of the shard on which the test suite will run. 38 shard_index: Index number of the shard on which the test suite will run.
39 build_type: 'Release' or 'Debug'. 39 build_type: 'Release' or 'Debug'.
40 """ 40 """
41 self.device = device 41 self.device = device
42 self.adb = android_commands.AndroidCommands(device=device) 42 self.adb = android_commands.AndroidCommands(device=device)
43 self.tool = CreateTool(tool, self.adb) 43 self.tool = CreateTool(tool, self.adb)
44 # Synchronize date/time between host and device. Otherwise same file on
45 # host and device may have different timestamp which may cause
46 # AndroidCommands.PushIfNeeded failed, or a test which may compare timestamp
47 # got from http head and local time could be failed.
48 self.adb.SynchronizeDateTime()
49 self._http_server = None 44 self._http_server = None
50 self._forwarder = None 45 self._forwarder = None
51 self._forwarder_device_port = 8000 46 self._forwarder_device_port = 8000
52 self.forwarder_base_url = ('http://localhost:%d' % 47 self.forwarder_base_url = ('http://localhost:%d' %
53 self._forwarder_device_port) 48 self._forwarder_device_port)
54 self.flags = FlagChanger(self.adb) 49 self.flags = FlagChanger(self.adb)
55 self.shard_index = shard_index 50 self.shard_index = shard_index
56 self.flags.AddFlags(['--disable-fre']) 51 self.flags.AddFlags(['--disable-fre'])
57 self._spawning_server = None 52 self._spawning_server = None
58 self._spawner_forwarder = None 53 self._spawner_forwarder = None
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 # Wait for 2 seconds then restart. 223 # Wait for 2 seconds then restart.
229 time.sleep(2) 224 time.sleep(2)
230 if not server_ready: 225 if not server_ready:
231 logging.error(';'.join(error_msgs)) 226 logging.error(';'.join(error_msgs))
232 raise Exception('Can not start the test spawner server.') 227 raise Exception('Can not start the test spawner server.')
233 self._PushTestServerPortInfoToDevice() 228 self._PushTestServerPortInfoToDevice()
234 self._spawner_forwarder = Forwarder( 229 self._spawner_forwarder = Forwarder(
235 self.adb, 230 self.adb,
236 [(self.test_server_spawner_port, self.test_server_spawner_port)], 231 [(self.test_server_spawner_port, self.test_server_spawner_port)],
237 self.tool, '127.0.0.1', self.build_type) 232 self.tool, '127.0.0.1', self.build_type)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698