From a30f829e62ca245db7d2ddcd22054b1494ce3a4c Mon Sep 17 00:00:00 2001
From: Adele Zhou <adelez@google.com>
Date: Mon, 2 Nov 2015 13:15:46 -0800
Subject: [PATCH] Renamed report_utils.py.
---
tools/run_tests/{generate_reports.py => report_utils.py} | 0
tools/run_tests/run_interop_tests.py | 8 +++-----
tools/run_tests/run_tests.py | 4 ++--
3 files changed, 5 insertions(+), 7 deletions(-)
rename tools/run_tests/{generate_reports.py => report_utils.py} (100%)
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 efbfe1f269..cebe246886 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 725b481239..ae7899e47e 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,
--
GitLab