OLD | NEW |
---|---|
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 glob | |
5 import os | 6 import os |
6 import re | 7 import re |
7 import urllib | 8 import urllib |
8 | 9 |
9 from infra.libs.infra_types import freeze | 10 from infra.libs.infra_types import freeze |
10 from slave import recipe_api | 11 from slave import recipe_api |
11 | 12 |
12 INSTRUMENTATION_TESTS = freeze([ | 13 INSTRUMENTATION_TESTS = freeze([ |
13 { | 14 { |
14 'test': 'AndroidWebViewTest', | 15 'test': 'AndroidWebViewTest', |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
351 link = ('https://code.google.com/p/chromium/issues/entry?%s' % | 352 link = ('https://code.google.com/p/chromium/issues/entry?%s' % |
352 urllib.urlencode(params)) | 353 urllib.urlencode(params)) |
353 f.result.presentation.links.update({ | 354 f.result.presentation.links.update({ |
354 'report a bug': link | 355 'report a bug': link |
355 }) | 356 }) |
356 raise | 357 raise |
357 | 358 |
358 def provision_devices(self, skip_wipe=False, disable_location=False, | 359 def provision_devices(self, skip_wipe=False, disable_location=False, |
359 min_battery_level=None, disable_network=False, | 360 min_battery_level=None, disable_network=False, |
360 disable_java_debug=False, reboot_timeout=None, | 361 disable_java_debug=False, reboot_timeout=None, |
362 no_adb_keys_files=False, | |
361 **kwargs): | 363 **kwargs): |
362 args = ['-t', self.m.chromium.c.BUILD_CONFIG] | 364 args = ['-t', self.m.chromium.c.BUILD_CONFIG] |
363 if skip_wipe: | 365 if skip_wipe: |
364 args.append('--skip-wipe') | 366 args.append('--skip-wipe') |
367 if not no_adb_keys_files: | |
navabi
2015/03/04 00:19:23
This option is for if in the future some bots may
jbudorick
2015/03/04 00:23:50
I don't really have a problem with having an optio
navabi
2015/03/04 00:56:38
I agree. Done.
| |
368 if glob.glob(os.path.join(os.environ['HOME'], '.android', '*.pub')): | |
369 args.append('--adb-key-files %s' % os.path.join(os.environ['HOME'], | |
370 '.android', '*.pub')) | |
365 if disable_location: | 371 if disable_location: |
366 args.append('--disable-location') | 372 args.append('--disable-location') |
367 if reboot_timeout is not None: | 373 if reboot_timeout is not None: |
368 assert isinstance(reboot_timeout, int) | 374 assert isinstance(reboot_timeout, int) |
369 assert reboot_timeout > 0 | 375 assert reboot_timeout > 0 |
370 args.extend(['--reboot-timeout', reboot_timeout]) | 376 args.extend(['--reboot-timeout', reboot_timeout]) |
371 if min_battery_level is not None: | 377 if min_battery_level is not None: |
372 assert isinstance(min_battery_level, int) | 378 assert isinstance(min_battery_level, int) |
373 assert min_battery_level >= 0 | 379 assert min_battery_level >= 0 |
374 assert min_battery_level <= 100 | 380 assert min_battery_level <= 100 |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
730 | 736 |
731 self.m.gsutil.upload( | 737 self.m.gsutil.upload( |
732 source=self.coverage_dir.join('coverage_html'), | 738 source=self.coverage_dir.join('coverage_html'), |
733 bucket='chrome-code-coverage', | 739 bucket='chrome-code-coverage', |
734 dest=gs_dest, | 740 dest=gs_dest, |
735 args=['-R'], | 741 args=['-R'], |
736 name='upload coverage report', | 742 name='upload coverage report', |
737 link_name='Coverage report', | 743 link_name='Coverage report', |
738 version='4.7', | 744 version='4.7', |
739 **kwargs) | 745 **kwargs) |
OLD | NEW |