From 764494a251abb95d26f83e165480b368343246b0 Mon Sep 17 00:00:00 2001 From: xiaohaoliang Date: Fri, 3 Mar 2017 11:39:09 +0800 Subject: [PATCH 1/3] Update README.md --- tools/run_tests/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/run_tests/README.md b/tools/run_tests/README.md index e709ddd2c02..d5bd9e7bb9d 100644 --- a/tools/run_tests/README.md +++ b/tools/run_tests/README.md @@ -33,7 +33,7 @@ the script also supports orchestrating test runs with client and server running to BigQuery. ######Example -`tools/run_tests/run_peformance_tests.py -l c++ node` +`tools/run_tests/run_performance_tests.py -l c++ node` ######Useful options - `--regex` use regex to select particular scenarios to run. From 883fe50140a44927853ebffcbe5747dcc2c348e3 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 4 May 2017 14:06:53 +0200 Subject: [PATCH 2/3] add error and failure count to sponge log --- tools/run_tests/python_utils/report_utils.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/run_tests/python_utils/report_utils.py b/tools/run_tests/python_utils/report_utils.py index c7c0ceea92d..002f49960ab 100644 --- a/tools/run_tests/python_utils/report_utils.py +++ b/tools/run_tests/python_utils/report_utils.py @@ -64,6 +64,8 @@ def render_junit_xml_report(resultset, xml_report, suite_package='grpc', root = ET.Element('testsuites') testsuite = ET.SubElement(root, 'testsuite', id='1', package=suite_package, name=suite_name) + failure_count = 0 + error_count = 0 for shortname, results in six.iteritems(resultset): for result in results: xml_test = ET.SubElement(testsuite, 'testcase', name=shortname) @@ -73,10 +75,14 @@ def render_junit_xml_report(resultset, xml_report, suite_package='grpc', 'XML') if result.state == 'FAILED': ET.SubElement(xml_test, 'failure', message='Failure') + failure_count += 1 elif result.state == 'TIMEOUT': ET.SubElement(xml_test, 'error', message='Timeout') + error_count += 1 elif result.state == 'SKIPPED': ET.SubElement(xml_test, 'skipped', message='Skipped') + testsuite.set('failures', str(failure_count)) + testsuite.set('errors', str(error_count)) # ensure the report directory exists report_dir = os.path.dirname(os.path.abspath(xml_report)) if not os.path.exists(report_dir): From 98ae39c121eaba4732a951a6525d7a15518d850f Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 4 May 2017 16:18:28 +0200 Subject: [PATCH 3/3] show error details in internal_ci --- tools/run_tests/python_utils/report_utils.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/run_tests/python_utils/report_utils.py b/tools/run_tests/python_utils/report_utils.py index 002f49960ab..502efc31f4f 100644 --- a/tools/run_tests/python_utils/report_utils.py +++ b/tools/run_tests/python_utils/report_utils.py @@ -71,13 +71,12 @@ def render_junit_xml_report(resultset, xml_report, suite_package='grpc', xml_test = ET.SubElement(testsuite, 'testcase', name=shortname) if result.elapsed_time: xml_test.set('time', str(result.elapsed_time)) - ET.SubElement(xml_test, 'system-out').text = _filter_msg(result.message, - 'XML') + filtered_msg = _filter_msg(result.message, 'XML') if result.state == 'FAILED': - ET.SubElement(xml_test, 'failure', message='Failure') + ET.SubElement(xml_test, 'failure', message='Failure').text = filtered_msg failure_count += 1 elif result.state == 'TIMEOUT': - ET.SubElement(xml_test, 'error', message='Timeout') + ET.SubElement(xml_test, 'error', message='Timeout').text = filtered_msg error_count += 1 elif result.state == 'SKIPPED': ET.SubElement(xml_test, 'skipped', message='Skipped')