Chromium Code Reviews Chromium Code Reviews
Issue 2252553002:
Add cs-base-url, store_tombstones, master_name for android inst tests. (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master| 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 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 832 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 843 annotation=None, except_annotation=None, | 843 annotation=None, except_annotation=None, |
| 844 screenshot=False, verbose=False, tool=None, | 844 screenshot=False, verbose=False, tool=None, |
| 845 apk_package=None, | 845 apk_package=None, |
| 846 official_build=False, | 846 official_build=False, |
| 847 json_results_file=None, | 847 json_results_file=None, |
| 848 timeout_scale=None, strict_mode=None, | 848 timeout_scale=None, strict_mode=None, |
| 849 suffix=None, num_retries=None, | 849 suffix=None, num_retries=None, |
| 850 device_flags=None, | 850 device_flags=None, |
| 851 wrapper_script_suite_name=None, | 851 wrapper_script_suite_name=None, |
| 852 result_details=False, | 852 result_details=False, |
| 853 master_name=None, | |
|
jbudorick
2016/08/17 04:15:28
Remove this argument.
BigBossZhiling
2016/08/17 22:38:27
Done.
| |
| 854 cs_base_url=None, | |
| 853 **kwargs): | 855 **kwargs): |
| 854 args = [ | 856 args = [ |
| 855 '--blacklist-file', self.blacklist_file, | 857 '--blacklist-file', self.blacklist_file, |
| 856 ] | 858 ] |
| 857 if tool: | 859 if tool: |
| 858 args.append('--tool=%s' % tool) | 860 args.append('--tool=%s' % tool) |
| 859 if flakiness_dashboard: | 861 if flakiness_dashboard: |
| 860 args.extend(['--flakiness-dashboard-server', flakiness_dashboard]) | 862 args.extend(['--flakiness-dashboard-server', flakiness_dashboard]) |
| 861 if annotation: | 863 if annotation: |
| 862 args.extend(['-A', annotation]) | 864 args.extend(['-A', annotation]) |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 905 step_result = self.test_runner( | 907 step_result = self.test_runner( |
| 906 step_name, | 908 step_name, |
| 907 args=args, | 909 args=args, |
| 908 wrapper_script_suite_name=wrapper_script_suite_name, | 910 wrapper_script_suite_name=wrapper_script_suite_name, |
| 909 **kwargs) | 911 **kwargs) |
| 910 finally: | 912 finally: |
| 911 if result_details: | 913 if result_details: |
| 912 with self.m.step.nest('process results for %s' % step_name): | 914 with self.m.step.nest('process results for %s' % step_name): |
| 913 try: | 915 try: |
| 914 details_html = details_dir.join('details.html') | 916 details_html = details_dir.join('details.html') |
| 917 presentation_args = ['--json-file', | |
| 918 json_results_file, | |
| 919 '--html-file', | |
| 920 details_html] | |
| 921 if master_name: | |
| 922 presentation_args.extend(['--master-name', master_name]) | |
|
jbudorick
2016/08/17 04:15:28
Just use self.m.properties.get('mastername') as ma
BigBossZhiling
2016/08/17 22:38:27
Done.
| |
| 923 if cs_base_url: | |
| 924 presentation_args.extend(['--cs-base-url', cs_base_url]) | |
| 915 self.m.python( | 925 self.m.python( |
| 916 'Generate Result Details', | 926 'Generate Result Details', |
| 917 self.resource('test_results_presentation.py'), | 927 self.resource('test_results_presentation.py'), |
| 918 args=['--json-file', | 928 args=presentation_args) |
| 919 json_results_file, | |
| 920 '--html-file', | |
| 921 details_html]) | |
| 922 details_list = self.m.file.read( | 929 details_list = self.m.file.read( |
| 923 'Read detail.html', | 930 'Read detail.html', |
| 924 details_html, | 931 details_html, |
| 925 test_data="<!DOCTYPE html><html></html>").splitlines() | 932 test_data="<!DOCTYPE html><html></html>").splitlines() |
| 926 self.m.step.active_result.presentation.logs['result_details'] = ( | 933 self.m.step.active_result.presentation.logs['result_details'] = ( |
| 927 details_list) | 934 details_list) |
| 928 finally: | 935 finally: |
| 929 self.m.file.rmtree('Remove details.html tmp files.', details_dir) | 936 self.m.file.rmtree('Remove details.html tmp files.', details_dir) |
| 930 return step_result | 937 return step_result |
| 931 | 938 |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1468 script = self.c.test_runner | 1475 script = self.c.test_runner |
| 1469 if wrapper_script_suite_name: | 1476 if wrapper_script_suite_name: |
| 1470 script = self.m.chromium.output_dir.join('bin', 'run_%s' % | 1477 script = self.m.chromium.output_dir.join('bin', 'run_%s' % |
| 1471 wrapper_script_suite_name) | 1478 wrapper_script_suite_name) |
| 1472 else: | 1479 else: |
| 1473 env = kwargs.get('env', {}) | 1480 env = kwargs.get('env', {}) |
| 1474 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', | 1481 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', |
| 1475 self.m.chromium.output_dir) | 1482 self.m.chromium.output_dir) |
| 1476 kwargs['env'] = env | 1483 kwargs['env'] = env |
| 1477 return self.m.python(step_name, script, args, **kwargs) | 1484 return self.m.python(step_name, script, args, **kwargs) |
| OLD | NEW |
