Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
5f32c517
Commit
5f32c517
authored
7 years ago
by
Yong Ni
Browse files
Options
Downloads
Patches
Plain Diff
Added timestamp to the xml report and minor changes to the API per review feedback.
parent
f303426f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tools/interop_matrix/run_interop_matrix_tests.py
+5
-8
5 additions, 8 deletions
tools/interop_matrix/run_interop_matrix_tests.py
tools/run_tests/python_utils/report_utils.py
+16
-13
16 additions, 13 deletions
tools/run_tests/python_utils/report_utils.py
with
21 additions
and
21 deletions
tools/interop_matrix/run_interop_matrix_tests.py
+
5
−
8
View file @
5f32c517
...
...
@@ -143,7 +143,7 @@ def find_test_cases(lang, release):
_loaded_testcases
[
lang
][
release
]
=
job_spec_list
return
job_spec_list
_xml_report_tree
=
None
_xml_report_tree
=
report_utils
.
new_junit_xml_tree
()
def
run_tests_for_lang
(
lang
,
runtime
,
images
):
"""
Find and run all test cases for a language.
...
...
@@ -163,15 +163,12 @@ def run_tests_for_lang(lang, runtime, images):
else
:
jobset
.
message
(
'
SUCCESS
'
,
'
All tests passed
'
,
do_newline
=
True
)
# Required, otherwise _xml_report_tree will be shadowed by local (undefined)
# reference in the next line.
global
_xml_report_tree
_xml_report_tree
=
report_utils
.
add_junit_xml_results
(
report_utils
.
append_junit_xml_results
(
_xml_report_tree
,
resultset
,
'
grpc_interop_matrix
'
,
'
%s__%s:%s
'
%
(
lang
,
runtime
,
release
),
str
(
uuid
.
uuid4
()),
_xml_report_tree
)
str
(
uuid
.
uuid4
()))
_docker_images_cleanup
=
[]
def
cleanup
():
...
...
@@ -187,4 +184,4 @@ for lang in languages:
for
runtime
in
sorted
(
docker_images
.
keys
()):
run_tests_for_lang
(
lang
,
runtime
,
docker_images
[
runtime
])
report_utils
.
create_xml_report_file
(
args
.
report_
file
,
_xml_
report_
tre
e
)
report_utils
.
create_xml_report_file
(
_xml_
report_
tree
,
args
.
report_
fil
e
)
This diff is collapsed.
Click to expand it.
tools/run_tests/python_utils/report_utils.py
+
16
−
13
View file @
5f32c517
...
...
@@ -22,6 +22,7 @@ try:
from
mako
import
exceptions
except
(
ImportError
):
pass
# Mako not installed but it is ok.
import
datetime
import
os
import
string
import
xml.etree.cElementTree
as
ET
...
...
@@ -43,26 +44,29 @@ def _filter_msg(msg, output_format):
return
msg
def
render_junit_xml_report
(
resultset
,
xml_report
,
suite_package
=
'
grpc
'
,
def
new_junit_xml_tree
():
return
ET
.
ElementTree
(
ET
.
Element
(
'
testsuites
'
))
def
render_junit_xml_report
(
resultset
,
report_file
,
suite_package
=
'
grpc
'
,
suite_name
=
'
tests
'
):
"""
Generate JUnit-like XML report.
"""
tree
=
add_junit_xml_results
(
resultset
,
suite_package
,
suite_name
,
'
1
'
)
create_xml_report_file
(
xml_report
,
tree
)
tree
=
new_junit_xml_tree
()
append_junit_xml_results
(
tree
,
resultset
,
suite_package
,
suite_name
,
'
1
'
)
create_xml_report_file
(
tree
,
report_file
)
def
create_xml_report_file
(
xml_
report
,
tre
e
):
def
create_xml_report_file
(
tree
,
report
_fil
e
):
"""
Generate JUnit-like report file from xml tree .
"""
# ensure the report directory exists
report_dir
=
os
.
path
.
dirname
(
os
.
path
.
abspath
(
xml_
report
))
report_dir
=
os
.
path
.
dirname
(
os
.
path
.
abspath
(
report
_file
))
if
not
os
.
path
.
exists
(
report_dir
):
os
.
makedirs
(
report_dir
)
tree
.
write
(
xml_
report
,
encoding
=
'
UTF-8
'
)
tree
.
write
(
report
_file
,
encoding
=
'
UTF-8
'
)
def
add_junit_xml_results
(
resultset
,
suite_package
,
suite_name
,
id
,
old_tree
=
None
):
"""
Returns a JUnit-like XML report tree with added test results.
"""
root
=
ET
.
Element
(
'
testsuites
'
)
if
not
old_tree
else
old_tree
.
getroot
()
testsuite
=
ET
.
SubElement
(
root
,
'
testsuite
'
,
id
=
id
,
package
=
suite_package
,
name
=
suite_name
)
def
append_junit_xml_results
(
tree
,
resultset
,
suite_package
,
suite_name
,
id
):
"""
Append a JUnit-like XML report tree with test results as a new suite.
"""
testsuite
=
ET
.
SubElement
(
tree
.
getroot
(),
'
testsuite
'
,
id
=
id
,
package
=
suite_package
,
name
=
suite_name
,
timestamp
=
datetime
.
datetime
.
now
().
isoformat
())
failure_count
=
0
error_count
=
0
for
shortname
,
results
in
six
.
iteritems
(
resultset
):
...
...
@@ -81,7 +85,6 @@ def add_junit_xml_results(resultset, suite_package, suite_name, id,
ET
.
SubElement
(
xml_test
,
'
skipped
'
,
message
=
'
Skipped
'
)
testsuite
.
set
(
'
failures
'
,
str
(
failure_count
))
testsuite
.
set
(
'
errors
'
,
str
(
error_count
))
return
ET
.
ElementTree
(
root
)
def
render_interop_html_report
(
client_langs
,
server_langs
,
test_cases
,
auth_test_cases
,
http2_cases
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment