Skip to content

Revert rework of xunit2 patching (#469) #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
j-rivero merged 1 commit into from
Jun 9, 2020
Merged

Revert rework of xunit2 patching (#469) #470

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 8 additions & 18 deletions ros2_batch_job/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import argparse
import configparser
from distutils.version import StrictVersion
import os
from pathlib import Path
import platform
Expand Down Expand Up @@ -385,23 +384,18 @@ def build_and_test(args, job):
# xunit2 format is needed to make Jenkins xunit plugin 2.x happy
with open('pytest.ini', 'w') as ini_file:
ini_file.write('[pytest]\njunit_family=xunit2')
# check if packages have a pytest.ini file that doesn't choose junit_family=xunit2
# and patch configuration if needed to force the xunit2 value
# Import pytest here instead of the top of the file, see https://github.com/ros2/ci/issues/467
import pytest
xunit_6_or_greater = StrictVersion(pytest.__version__) >= StrictVersion('6.0.0')
# check if packages have a pytest.ini file and add the xunit2
# format if it is not present
for path in Path('.').rglob('pytest.ini'):
config = configparser.ConfigParser()
config.read(str(path))
if xunit_6_or_greater:
# only need to correct explicit legacy option if exists
if not check_xunit2_junit_family_value(config, 'legacy'):
try:
# only if xunit2 is set continue the loop with the file unpatched
if config.get('pytest', 'junit_family') == 'xunit2':
continue
else:
# in xunit < 6 need to enforce xunit2 if not set
if check_xunit2_junit_family_value(config, 'xunit2'):
continue
print("Patch '%s' to override 'pytest.junit_family=xunit2'" % path)
except configparser.NoOptionError:
pass
print('xunit2 patch applied to ' + str(path))
config.set('pytest', 'junit_family', 'xunit2')
with open(path, 'w+') as configfile:
config.write(configfile)
Expand Down Expand Up @@ -449,10 +443,6 @@ def build_and_test(args, job):
return 0


def check_xunit2_junit_family_value(config, value):
return config.get('pytest', 'junit_family', fallback='') == value


def run(args, build_function, blacklisted_package_names=None):
if blacklisted_package_names is None:
blacklisted_package_names = []
Expand Down