merge-junit-results.py: move env_name to the end (#38334)
This commit is contained in:
parent
bdf18980aa
commit
43c8706940
|
@ -39,9 +39,11 @@ def merge_results(xml_files):
|
|||
|
||||
for file_name in xml_files:
|
||||
tree = ET.parse(file_name)
|
||||
name = JUNIT_RE.match(file_name)
|
||||
if name:
|
||||
name = name.group(1)
|
||||
env_name = JUNIT_RE.match(file_name)
|
||||
if env_name:
|
||||
env_name = env_name.group(1)
|
||||
else:
|
||||
env_name = file_name.rsplit('.', 1)[0]
|
||||
test_suites = tree.getroot()
|
||||
for test_suite in test_suites:
|
||||
failures += int(test_suite.attrib.get('failures', '0'))
|
||||
|
@ -49,8 +51,11 @@ def merge_results(xml_files):
|
|||
errors += int(test_suite.attrib.get('errors', '0'))
|
||||
time += float(test_suite.attrib.get('time', '0.'))
|
||||
for test_case in test_suite.findall('testcase'):
|
||||
if name:
|
||||
test_case.attrib['classname'] = '%s.%s' % (name, test_case.attrib.get('classname', ''))
|
||||
if env_name:
|
||||
if test_case.attrib['name'].endswith(']'):
|
||||
test_case.attrib['name'] = test_case.attrib['name'][:-1] + ',' + env_name + ']'
|
||||
else:
|
||||
test_case.attrib['name'] += '[%s]' % env_name
|
||||
cases.append(test_case)
|
||||
|
||||
new_root = ET.Element('testsuites')
|
||||
|
|
Loading…
Reference in New Issue