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

Side by Side Diff: scripts/slave/recipe_modules/chromium_android/api.py

Issue 2192563004: [Android] Move host_info from test config to recipe step for android perf bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: [Android] Move host_info from test config to recipe step for android perf bots. Created 4 years, 4 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
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 datetime 6 import datetime
7 import json 7 import json
8 import os 8 import os
9 import re 9 import re
10 import sys 10 import sys
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 'file format is compatible') 363 'file format is compatible')
364 364
365 def device_status_check(self, restart_usb=False, **kwargs): 365 def device_status_check(self, restart_usb=False, **kwargs):
366 # TODO(bpastene): Remove once chromium revisions prior to 366 # TODO(bpastene): Remove once chromium revisions prior to
367 # crrev.com/1faecde0c03013b6cd725da413339c60223f8948 are no longer tested. 367 # crrev.com/1faecde0c03013b6cd725da413339c60223f8948 are no longer tested.
368 # See crbug.com/619707 for context. 368 # See crbug.com/619707 for context.
369 self.revert_device_file_format() 369 self.revert_device_file_format()
370 self.device_recovery() 370 self.device_recovery()
371 return self.device_status() 371 return self.device_status()
372 372
373 def host_info(self, args=[], **kwargs):
374 try:
375 with self.handle_exit_codes():
376 args.extend(['run', '--output', self.m.json.output()])
377 self.m.step(
jbudorick 2016/07/28 20:23:11 Add some step test data here, please.
rnephew (Reviews Here) 2016/07/28 21:11:35 Done.
378 'Host_Info',
379 [self.m.path['checkout'].join('testing', 'scripts',
380 'host_info.py')] + args,
381 env=self.m.chromium.get_env(),
382 infra_step=True,
383 **kwargs)
384 except self.m.step.InfraFailure:
385 pass
rnephew (Reviews Here) 2016/07/28 19:24:16 We do not want it to fail hard when it experiences
jbudorick 2016/07/28 20:23:11 I think this is ok. I'm not sure it'll cause the b
386
373 def device_recovery(self, restart_usb=False, **kwargs): 387 def device_recovery(self, restart_usb=False, **kwargs):
374 args = [ 388 args = [
375 '--blacklist-file', self.blacklist_file, 389 '--blacklist-file', self.blacklist_file,
376 '--known-devices-file', self.known_devices_file, 390 '--known-devices-file', self.known_devices_file,
377 '--adb-path', self.m.adb.adb_path(), 391 '--adb-path', self.m.adb.adb_path(),
378 '-v' 392 '-v'
379 ] 393 ]
380 self.m.step( 394 self.m.step(
381 'device_recovery', 395 'device_recovery',
382 [self.m.path['checkout'].join('third_party', 'catapult', 'devil', 396 [self.m.path['checkout'].join('third_party', 'catapult', 'devil',
(...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 script = self.c.test_runner 1423 script = self.c.test_runner
1410 if wrapper_script_suite_name: 1424 if wrapper_script_suite_name:
1411 script = self.m.chromium.output_dir.join('bin', 'run_%s' % 1425 script = self.m.chromium.output_dir.join('bin', 'run_%s' %
1412 wrapper_script_suite_name) 1426 wrapper_script_suite_name)
1413 else: 1427 else:
1414 env = kwargs.get('env', {}) 1428 env = kwargs.get('env', {})
1415 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', 1429 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
1416 self.m.chromium.output_dir) 1430 self.m.chromium.output_dir)
1417 kwargs['env'] = env 1431 kwargs['env'] = env
1418 return self.m.python(step_name, script, args, **kwargs) 1432 return self.m.python(step_name, script, args, **kwargs)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698