diff options
author | Craig Tiller <ctiller@google.com> | 2017-05-05 07:58:50 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-05-05 07:58:50 -0700 |
commit | 25a01850a696d6d5d2ab7774c3dd9ec3a370cdac (patch) | |
tree | 691ec3f0eedff909d195cd9d9282409442c06652 | |
parent | 66918a6106476cbd60137c725529cb22ab958b14 (diff) | |
parent | 6815e414a4dbca4d0d4dd62b5ec3c6faa60c9bb9 (diff) |
Merge github.com:grpc/grpc into timer_pool
-rw-r--r-- | tools/run_tests/README.md | 2 | ||||
-rw-r--r-- | tools/run_tests/python_utils/report_utils.py | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/tools/run_tests/README.md b/tools/run_tests/README.md index 05d33fd6b1..60f20747cd 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. diff --git a/tools/run_tests/python_utils/report_utils.py b/tools/run_tests/python_utils/report_utils.py index c7c0ceea92..502efc31f4 100644 --- a/tools/run_tests/python_utils/report_utils.py +++ b/tools/run_tests/python_utils/report_utils.py @@ -64,19 +64,24 @@ 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) 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') + 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): |