Skip to content
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

Jump to bottom

config: fix the paths considered for initial conftest discovery #11125

Merged
merged 2 commits into from
Jun 21, 2023
Merged

config: fix the paths considered for initial conftest discovery #11125

merged 2 commits into from
Jun 21, 2023

Commits on Jun 20, 2023

  1. config: extract initial paths/nodeids args logic to a function 

    Will be reused in the next commit.
    @bluetech
    bluetech committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    d97d44a View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. config: fix the paths considered for initial conftest discovery 

    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.)
    @bluetech
    bluetech committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    1489032 View commit details
    Browse the repository at this point in the history