Chromium Code Reviews| Index: build/android/pylib/results/presentation/test_results_presentation.py |
| diff --git a/build/android/pylib/results/presentation/test_results_presentation.py b/build/android/pylib/results/presentation/test_results_presentation.py |
| index fb8ab7f881da813c3ff5568571167133b2e18541..bd19dcc3b81cfd4aa8d304284969a9a3e9e18fed 100755 |
| --- a/build/android/pylib/results/presentation/test_results_presentation.py |
| +++ b/build/android/pylib/results/presentation/test_results_presentation.py |
| @@ -10,6 +10,7 @@ import json |
| import tempfile |
| import os |
| import sys |
| +import urllib |
| CURRENT_DIR = os.path.dirname(os.path.abspath(__file__)) |
| BASE_DIR = os.path.abspath(os.path.join( |
| @@ -252,7 +253,17 @@ def create_suite_table(results_dict): |
| footer_row) |
| -def results_to_html(results_dict, cs_base_url): |
| +def feedback_url(result_details_link): |
| + url_args = urllib.urlencode([ |
| + ('labels', 'Pri-2,Type-Bug,Restrict-View-Google'), |
| + ('summary', 'Result Details Feedback:'), |
| + ('components', 'Test>Android'), |
| + ('comment', 'Please check out: %s' % result_details_link)]) |
| + return 'https://bugs.chromium.org/p/chromium/issues/entry?%s' % url_args |
| + |
| + |
| +def results_to_html(results_dict, cs_base_url, bucket, test_name, |
| + builder_name, build_number): |
| """Convert list of test results into html format.""" |
| test_rows_header, test_rows = create_test_table(results_dict, cs_base_url) |
| @@ -274,11 +285,20 @@ def results_to_html(results_dict, cs_base_url): |
| main_template = JINJA_ENVIRONMENT.get_template( |
| os.path.join('template', 'main.html')) |
| - return main_template.render( # pylint: disable=no-member |
| - {'tb_values': [suite_table_values, test_table_values]}) |
| + dest = google_storage_helper.unique_name( |
| + '%s_%s_%s' % (test_name, builder_name, build_number)) |
| + |
| + result_details_link = google_storage_helper.get_url_link( |
| + dest, '%s/html' % bucket) |
| + return (main_template.render( # pylint: disable=no-member |
| + {'tb_values': [suite_table_values, test_table_values], |
| + 'feedback_url': feedback_url(result_details_link) |
| + }), dest, result_details_link) |
| -def result_details(json_path, cs_base_url): |
| + |
| +def result_details(json_path, cs_base_url, bucket, test_name, |
| + builder_name, build_number): |
| """Get result details from json path and then convert results to html.""" |
| with open(json_path) as json_file: |
| @@ -291,19 +311,16 @@ def result_details(json_path, cs_base_url): |
| for testsuite_run in json_object['per_iteration_data']: |
| for test, test_runs in testsuite_run.iteritems(): |
| results_dict[test].extend(test_runs) |
| - return results_to_html(results_dict, cs_base_url) |
| + return results_to_html(results_dict, cs_base_url, bucket, |
| + test_name, builder_name, build_number) |
| -def upload_to_google_bucket(html, test_name, builder_name, build_number, |
| - bucket): |
| +def upload_to_google_bucket(html, bucket, dest): |
| with tempfile.NamedTemporaryFile(suffix='.html') as temp_file: |
| temp_file.write(html) |
| temp_file.flush() |
| - |
| - return google_storage_helper.upload( |
| - name=google_storage_helper.unique_name( |
| - '%s_%s_%s' % (test_name, builder_name, build_number), |
| - suffix='.html'), |
| + google_storage_helper.upload( |
| + name=dest, |
| filepath=temp_file.name, |
| bucket='%s/html' % bucket, |
| content_type='text/html', |
| @@ -380,11 +397,14 @@ def main(): |
| if not os.path.exists(json_file): |
| raise IOError('--json-file %s not found.' % json_file) |
| - result_html_string = result_details(json_file, args.cs_base_url) |
| - result_details_link = upload_to_google_bucket( |
| + # Link to result details presentation page is a part of the page. |
| + result_html_string, dest, result_details_link = result_details( |
| + json_file, args.cs_base_url, args.bucket, |
| + args.test_name, builder_name, build_number) |
| + |
| + upload_to_google_bucket( |
|
jbudorick
2017/05/08 17:28:10
Check the result of this against result_details_li
|
| result_html_string.encode('UTF-8'), |
| - args.test_name, builder_name, |
| - build_number, args.bucket) |
| + args.bucket, dest) |
| if args.output_json: |
| with open(json_file) as original_json_file: |