Projet

Général

Profil

0001-Jenkinsfile-use-mergeJunitResults-38298.patch

Benjamin Dauvergne, 09 décembre 2019 11:39

Télécharger (2,77 ko)

Voir les différences:

Subject: [PATCH] Jenkinsfile: use mergeJunitResults() (#38298)

 Jenkinsfile            |  3 +-
 merge-junit-results.py | 65 ------------------------------------------
 2 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100755 merge-junit-results.py
Jenkinsfile
22 22
                        utils.publish_coverage_native('index.html')
23 23
                        utils.publish_pylint('pylint.out')
24 24
                    }
25
                    sh './merge-junit-results.py junit-*.xml >junit.xml'
26
                    junit 'junit.xml'
25
                    mergeJunitResults()
27 26
                }
28 27
            }
29 28
        }
merge-junit-results.py
1
#!/usr/bin/env python
2
#
3
#  Corey Goldberg, Dec 2012
4
#
5

  
6
import os
7
import sys
8
import xml.etree.ElementTree as ET
9

  
10

  
11
"""Merge multiple JUnit XML files into a single results file.
12
Output dumps to sdtdout.
13
example usage:
14
    $ python merge_junit_results.py results1.xml results2.xml > results.xml
15
"""
16

  
17

  
18
def main():
19
    args = sys.argv[1:]
20
    if not args:
21
        usage()
22
        sys.exit(2)
23
    if '-h' in args or '--help' in args:
24
        usage()
25
        sys.exit(2)
26
    merge_results(args[:])
27

  
28

  
29
def merge_results(xml_files):
30
    failures = 0
31
    tests = 0
32
    errors = 0
33
    time = 0.0
34
    cases = []
35

  
36
    for file_name in xml_files:
37
        tree = ET.parse(file_name)
38
        test_suite = tree.getroot()
39
        failures += int(test_suite.attrib.get('failures', '0'))
40
        tests += int(test_suite.attrib.get('tests', '0'))
41
        errors += int(test_suite.attrib.get('errors', '0'))
42
        time += float(test_suite.attrib.get('time', '0.'))
43
        name = test_suite.attrib.get('name', '')
44
        for child in test_suite.getchildren():
45
            child.attrib['classname'] = '%s-%s' % (name, child.attrib.get('classname', ''))
46
        cases.append(test_suite.getchildren())
47

  
48
    new_root = ET.Element('testsuite')
49
    new_root.attrib['failures'] = '%s' % failures
50
    new_root.attrib['tests'] = '%s' % tests
51
    new_root.attrib['errors'] = '%s' % errors
52
    new_root.attrib['time'] = '%s' % time
53
    for case in cases:
54
        new_root.extend(case)
55
    new_tree = ET.ElementTree(new_root)
56
    ET.dump(new_tree)
57

  
58

  
59
def usage():
60
    this_file = os.path.basename(__file__)
61
    print('Usage:  %s results1.xml results2.xml' % this_file)
62

  
63

  
64
if __name__ == '__main__':
65
    main()
66
-