diff --git a/tools/run_tests/generate_reports.py b/tools/run_tests/report_utils.py similarity index 100% rename from tools/run_tests/generate_reports.py rename to tools/run_tests/report_utils.py diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index efbfe1f269a2281fbd5aa6bd6934fdfc0ac1d5c7..cebe24688672d0108f6078e9d29a4da6ad1cf1f4 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -33,10 +33,10 @@ import argparse import dockerjob import itertools -import generate_reports import jobset import multiprocessing import os +import report_utils import subprocess import sys import tempfile @@ -627,11 +627,9 @@ try: else: jobset.message('SUCCESS', 'All tests passed', do_newline=True) - # Generate XML report. - generate_reports.render_xml_report(resultset, 'report.xml') + report_utils.render_xml_report(resultset, 'report.xml') - # Generate HTML report. - generate_reports.render_html_report( + report_utils.render_html_report( set([str(l) for l in languages]), servers, _TEST_CASES, _AUTH_TEST_CASES, resultset, num_failures, args.cloud_to_prod_auth or args.cloud_to_prod) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 725b48123990944d96d5a598819c2c8d88229391..ae7899e47ee9bc23ff9daa0b50f7204f45b35e08 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -48,8 +48,8 @@ import traceback import time import urllib2 -import generate_reports import jobset +import report_utils import watch_dirs ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..')) @@ -890,7 +890,7 @@ def _build_and_run( for antagonist in antagonists: antagonist.kill() if xml_report: - generate_reports.render_xml_report(resultset, xml_report) + report_utils.render_xml_report(resultset, xml_report) number_failures, _ = jobset.run( post_tests_steps, maxjobs=1, stop_on_failure=True,