Jenkinsfile: use mergeJunitResults() (#38300)
This commit is contained in:
parent
c8ec49431b
commit
603e20b5cf
|
@ -16,8 +16,7 @@ pipeline {
|
||||||
utils.publish_coverage_native('index.html')
|
utils.publish_coverage_native('index.html')
|
||||||
utils.publish_pylint('pylint.out')
|
utils.publish_pylint('pylint.out')
|
||||||
}
|
}
|
||||||
sh './merge-junit-results.py junit-*.xml >junit.xml'
|
mergeJunitResults()
|
||||||
junit 'junit.xml'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,65 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
#
|
|
||||||
# Corey Goldberg, Dec 2012
|
|
||||||
#
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import xml.etree.ElementTree as ET
|
|
||||||
|
|
||||||
|
|
||||||
"""Merge multiple JUnit XML files into a single results file.
|
|
||||||
Output dumps to sdtdout.
|
|
||||||
example usage:
|
|
||||||
$ python merge_junit_results.py results1.xml results2.xml > results.xml
|
|
||||||
"""
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
args = sys.argv[1:]
|
|
||||||
if not args:
|
|
||||||
usage()
|
|
||||||
sys.exit(2)
|
|
||||||
if '-h' in args or '--help' in args:
|
|
||||||
usage()
|
|
||||||
sys.exit(2)
|
|
||||||
merge_results(args[:])
|
|
||||||
|
|
||||||
|
|
||||||
def merge_results(xml_files):
|
|
||||||
failures = 0
|
|
||||||
tests = 0
|
|
||||||
errors = 0
|
|
||||||
time = 0.0
|
|
||||||
cases = []
|
|
||||||
|
|
||||||
for file_name in xml_files:
|
|
||||||
tree = ET.parse(file_name)
|
|
||||||
test_suite = tree.getroot()
|
|
||||||
failures += int(test_suite.attrib.get('failures', '0'))
|
|
||||||
tests += int(test_suite.attrib.get('tests', '0'))
|
|
||||||
errors += int(test_suite.attrib.get('errors', '0'))
|
|
||||||
time += float(test_suite.attrib.get('time', '0.'))
|
|
||||||
name = test_suite.attrib.get('name', '')
|
|
||||||
for child in test_suite.getchildren():
|
|
||||||
child.attrib['classname'] = '%s-%s' % (name, child.attrib.get('classname', ''))
|
|
||||||
cases.append(test_suite.getchildren())
|
|
||||||
|
|
||||||
new_root = ET.Element('testsuite')
|
|
||||||
new_root.attrib['failures'] = '%s' % failures
|
|
||||||
new_root.attrib['tests'] = '%s' % tests
|
|
||||||
new_root.attrib['errors'] = '%s' % errors
|
|
||||||
new_root.attrib['time'] = '%s' % time
|
|
||||||
for case in cases:
|
|
||||||
new_root.extend(case)
|
|
||||||
new_tree = ET.ElementTree(new_root)
|
|
||||||
ET.dump(new_tree)
|
|
||||||
|
|
||||||
|
|
||||||
def usage():
|
|
||||||
this_file = os.path.basename(__file__)
|
|
||||||
print('Usage: %s results1.xml results2.xml' % this_file)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
Loading…
Reference in New Issue