Force xunit2 for pytest 6.0 when legacy mode is enabled#415
Merged
Conversation
dirk-thomas
reviewed
Mar 20, 2020
ros2_batch_job/__main__.py
Outdated
| if config.get('pytest', 'junit_family') != 'legacy': | ||
| continue | ||
| except configparser.NoOptionError: | ||
| continue |
Member
There was a problem hiding this comment.
I am wondering if the duplicate logic in the if and else block can't be avoided...
Author
There was a problem hiding this comment.
the code was awful, yes. I made some changes in 057c1f7 . Hopefully it can be read more easily.
dirk-thomas
reviewed
Mar 20, 2020
Member
|
@j-rivero Friendly ping. |
Author
dirk-thomas
reviewed
Jun 5, 2020
Author
Member
|
(I just made some minor non-functional edits.) |
dirk-thomas
approved these changes
Jun 5, 2020
Author
|
Final test run https://ci.ros2.org/job/ci_linux/11030/console |
nuclearsandwich
added a commit
that referenced
this pull request
Jun 8, 2020
This reverts commit 3f57d6d.
This was referenced Jun 8, 2020
j-rivero
pushed a commit
that referenced
this pull request
Jun 9, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
following #406 (review)
pytest 6.x enables by default the xunit2 format (the one needed by ci.ros2.org Jenkins). With this version we won't need to force the pytest.ini patching in ROS packages. However, upstream could declare the use of the
legacymode not to use xunit2 format. This PR detects these cases and patch them accordingly iflegacyis being used.Tested:
(Tests errors seems unrelated to me, xunit2 patching is done right as far as I can tell).