terminal: fix crash in header reporting when absolute testpaths is used #7817
Conversation
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
bluetech
added
the
needs backport
Member
Author
|
Note: I only intend to backport the "terminal: fix crash in header reporting when absolute testpaths is used" commit. |
bluetech
force-pushed
the
fix-testpaths-bestrelpath2
branch
from
ab73086 to
bd47d3f
Compare
Regressed in 6.1.0 in 62e249a. The `x` is an `str` but is expected to be a `pathlib.Path`. Not caught by mypy because `config.getini()` returns `Any`. Fix by just removing the `bestrelpath` call: - testpaths are always relative to the rootdir, it thus would be very unusual to specify an absolute path there. - The code was wrong even before the regression: `py.path.local`'s `bestrelpath` function expects a `py.path.local`, not an `str`. But it had some weird `try ... except AttributeError` fallback which just returns the argument, i.e. it was a no-op. So there is no behavior change. - It seems reasonable to me to just print the full path if that's what the ini specifies.
Make it match better the condition on whether testpaths is used (found in config/__init__.py).
bluetech
force-pushed
the
fix-testpaths-bestrelpath2
branch
from
bd47d3f to
3ecdad6
Compare
nicoddemus
approved these changes
Oct 2, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #7814.
Regressed in 6.1.0 in 62e249a.
The
xis anstrbut is expected to be apathlib.Path. Not caught by mypy becauseconfig.getini()returnsAny.Fix by just removing the
bestrelpathcall:testpaths are always relative to the rootdir, it thus would be very unusual to specify an absolute path there.
The code was wrong even before the regression:
py.path.local'sbestrelpathfunction expects apy.path.local, not anstr. But it had some weirdtry ... except AttributeErrorfallback which just returns the argument, i.e. it was a no-op. So there is no behavior change.It seems reasonable to me to just print the full path if that's what the ini specifies.
The two other commits are related improvements.