Skip to content

Force xunit2 for pytest 6.0 when legacy mode is enabled #415

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 8 commits into from
Jun 5, 2020
Merged

Force xunit2 for pytest 6.0 when legacy mode is enabled #415

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66c4b35
Force xunit2 for pytest 6.0 when legacy mode is enabled
Mar 19, 2020
5d11513
Replace packaging module by distutils
Mar 20, 2020
057c1f7
Rework of xunit checks to simplify logic and avoid multiple checks in…
Apr 27, 2020
d0cf651
Improve output message from patching. Thansk to Dirk
Jun 5, 2020
bce4422
Simplify check_xunit2_junit_family_value function.
Jun 5, 2020
4e70a79
Remove force_xunit2_in_pytest_ini_files function. Use code directly
Jun 5, 2020
95c94f1
just moving check_xunit2_junit_family_value() below its usage
dirk-thomas Jun 5, 2020
5072cf4
update comment
dirk-thomas Jun 5, 2020
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
25 changes: 17 additions & 8 deletions ros2_batch_job/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@

import argparse
import configparser
from distutils.version import StrictVersion
import os
from pathlib import Path
import platform
import pytest
from shutil import which
import subprocess
import sys
Expand Down Expand Up @@ -382,18 +384,21 @@ 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 and add the xunit2
# format if it is not present
# 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
xunit_6_or_greater = StrictVersion(pytest.__version__) >= StrictVersion('6.0.0')
for path in Path('.').rglob('pytest.ini'):
config = configparser.ConfigParser()
config.read(str(path))
try:
# only if xunit2 is set continue the loop with the file unpatched
if config.get('pytest', 'junit_family') == 'xunit2':
if xunit_6_or_greater:
# only need to correct explicit legacy option if exists
if not check_xunit2_junit_family_value(config, 'legacy'):
continue
except configparser.NoOptionError:
pass
print('xunit2 patch applied to ' + str(path))
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)
config.set('pytest', 'junit_family', 'xunit2')
with open(path, 'w+') as configfile:
config.write(configfile)
Expand Down Expand Up @@ -441,6 +446,10 @@ 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