tests: Sync expected stream for Pytest' version #996
Merged
Conversation
This file contains 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
bluetech
reviewed
Feb 28, 2022
tests/test_manage_py_scan.py
Outdated
Comment on lines
121
to
126
| if result.errlines: | ||
| version_out = result.stderr | ||
| else: | ||
| # Pytest 7.0+ | ||
| version_out = result.stdout | ||
|
|
||
| version_out.fnmatch_lines(["*This is pytest version*"]) |
There was a problem hiding this comment.
I prefer to use an explicit pytest version check, since then when we drop support for pytest<7 it is much easier to find and remove no longer needed code.
Suggested change
| if result.errlines: | |
| version_out = result.stderr | |
| else: | |
| # Pytest 7.0+ | |
| version_out = result.stdout | |
| version_out.fnmatch_lines(["*This is pytest version*"]) | |
| if hasattr(pytest, 'version_info') and pytest.version_info >= (7, 0): | |
| version_out = result.stdout | |
| else: | |
| version_out = result.stderr | |
| version_out.fnmatch_lines(["*This is pytest version*"]) |
There was a problem hiding this comment.
Yes, this is better! Thanks @bluetech
There was a problem hiding this comment.
@bluetech, thank you for the suggestion! I thought about this.
I prefer to not rely on version-check but check for actual behavior. For future cleanup I added the comment in code. But of course, your pov as project's maintainer is higher than my own.
There was a problem hiding this comment.
updated.
Note: version_info => version_tuple (requires Pytest 7.0+).
stanislavlevin
force-pushed
the
issue_995
branch
from
b9f9e92
to
0056712
Compare
https://docs.pytest.org/en/7.0.x/changelog.html#breaking-changes: > [pytest#8246](pytest-dev/pytest#8246): --version now writes version information to stdout rather than stderr. Fixes: pytest-dev#995 Signed-off-by: Stanislav Levin <slev@altlinux.org>
stanislavlevin
force-pushed
the
issue_995
branch
from
0056712
to
458d48a
Compare
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.
https://docs.pytest.org/en/7.0.x/changelog.html#breaking-changes:
Fixes: #995