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

Side by Side Diff: blimp/tools/client_engine_integration.py

Issue 2341543002: Fix client integration script for blimp (Closed)
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright 2016 The Chromium Authors. All rights reserved. 2 # Copyright 2016 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """Blimp Client + Engine integration test system 6 """Blimp Client + Engine integration test system
7 7
8 Set up Client and Engine 8 Set up Client and Engine
9 Set up Forward to connect machine host with client device. 9 Set up Forward to connect machine host with client device.
10 Start Engine and run blimp on Android Client. 10 Start Engine and run blimp on Android Client.
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 def SetCommandFlag(device, engine_ip, engine_port): 122 def SetCommandFlag(device, engine_ip, engine_port):
123 """Set up adb Chrome command line flags 123 """Set up adb Chrome command line flags
124 124
125 Args: 125 Args:
126 device: (str) Serial number of device we should use. 126 device: (str) Serial number of device we should use.
127 engine_ip: (str) Blimp engine IP address. 127 engine_ip: (str) Blimp engine IP address.
128 engine_port: (str) Port on the engine. 128 engine_port: (str) Port on the engine.
129 """ 129 """
130 cmd_helper.GetCmdStatusAndOutput([ 130 cmd_helper.GetCmdStatusAndOutput([
131 os.path.join(SRC_PATH, 'build', 'android', 131 os.path.join(SRC_PATH, 'build', 'android',
132 'adb_chrome_command_line'), 132 'adb_chrome_public_command_line'),
133 '--device=' + str(device), 133 '--device=' + str(device),
134 '--enable-blimp', 134 '--enable-blimp',
135 '--engine-ip=' + engine_ip, 135 '--engine-ip=' + engine_ip,
136 '--engine-port=' + engine_port, 136 '--engine-port=' + engine_port,
137 '--engine-transport=tcp', 137 '--engine-transport=tcp',
138 '-v=0', 138 '-v=0',
139 '--vmodule=*blimp*=1', 139 '--vmodule=*blimp*=1',
140 '--blimp-client-token-path=' + _CLIENT_TOKEN_PATH]) 140 '--blimp-client-token-path=' + _CLIENT_TOKEN_PATH])
141 141
142 142
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 if blacklist_file 322 if blacklist_file
323 else None) 323 else None)
324 device = device_utils.DeviceUtils.HealthyDevices( 324 device = device_utils.DeviceUtils.HealthyDevices(
325 blacklist=blacklist, device_arg=serial)[0] 325 blacklist=blacklist, device_arg=serial)[0]
326 326
327 args.func(args, json_file_path, device) 327 args.func(args, json_file_path, device)
328 328
329 329
330 if __name__ == '__main__': 330 if __name__ == '__main__':
331 main() 331 main()
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698