config: fix the paths considered for initial conftest discovery#11125
Merged
bluetech merged 2 commits intopytest-dev:mainfrom Jun 21, 2023
Merged
config: fix the paths considered for initial conftest discovery#11125bluetech merged 2 commits intopytest-dev:mainfrom
bluetech merged 2 commits intopytest-dev:mainfrom
Conversation
Will be reused in the next commit.
nicoddemus
reviewed
Jun 20, 2023
| ) | ||
|
|
||
| # No fallback. | ||
| result = pytester.runpytest('.') |
nicoddemus
approved these changes
Jun 20, 2023
Member
nicoddemus
left a comment
There was a problem hiding this comment.
Thanks a lot for taking care of this @bluetech! Great work.
Fixes pytest-dev#11104. See the issue for a description of the problem. Now, we use the same logic for initial conftest paths as we do for deciding the initial args, which was the idea behind checking `namespace.file_or_dir` and `testpaths` previously. This fixes the issue of `testpaths` being considered for initial conftests even when it's not used for the args. (Another issue in faeb161 was that the `testpaths` were not glob-expanded, this is also fixed.)
5530529 to
1489032
Compare
Member
Author
|
I think maybe we shouldn't backport this, it's a bit too big for that. Let's just do a 7.4 release instead. I'll open an issue. |
5 tasks
aciba90
added a commit
to aciba90/cloud-init
that referenced
this pull request
Oct 24, 2023
After pytest-dev/pytest#11125 being included in pytest==7.4, pytest can be unpinned.
3 tasks
aciba90
added a commit
to aciba90/cloud-init
that referenced
this pull request
Oct 24, 2023
After pytest-dev/pytest#11125 being included in pytest==7.4, pytest can be unpinned.
blackboxsw
pushed a commit
to canonical/cloud-init
that referenced
this pull request
Oct 25, 2023
After pytest-dev/pytest#11125 being included in pytest==7.4, pytest can be unpinned.
holmanb
pushed a commit
to holmanb/cloud-init
that referenced
this pull request
Oct 31, 2023
After pytest-dev/pytest#11125 being included in pytest==7.4, pytest can be unpinned.
blackboxsw
pushed a commit
to canonical/cloud-init
that referenced
this pull request
Nov 2, 2023
After pytest-dev/pytest#11125 being included in pytest==7.4, pytest can be unpinned.
blackboxsw
pushed a commit
to blackboxsw/cloud-init
that referenced
this pull request
Nov 6, 2023
After pytest-dev/pytest#11125 being included in pytest==7.4, pytest can be unpinned.
holmanb
pushed a commit
to canonical/cloud-init
that referenced
this pull request
Nov 14, 2023
After pytest-dev/pytest#11125 being included in pytest==7.4, pytest can be unpinned.
holmanb
pushed a commit
to canonical/cloud-init
that referenced
this pull request
Nov 14, 2023
After pytest-dev/pytest#11125 being included in pytest==7.4, pytest can be unpinned.
holmanb
pushed a commit
to canonical/cloud-init
that referenced
this pull request
Nov 14, 2023
After pytest-dev/pytest#11125 being included in pytest==7.4, pytest can be unpinned.
holmanb
pushed a commit
to canonical/cloud-init
that referenced
this pull request
Nov 14, 2023
After pytest-dev/pytest#11125 being included in pytest==7.4, pytest can be unpinned.
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.
Fixes #11104. See the commits; the first one is just a refactor.