Skip to content

Move _collectfile to FSCollector #6830

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.

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

Merged
merged 1 commit into from
Feb 29, 2020

Conversation

blueyed
Copy link
Contributor

@blueyed blueyed commented Feb 27, 2020

Previously this was implemented both on Session and Package, where
the extra code in Package._collectfile was not covered/used.

Previously this was implemented both on `Session` and `Package`, where
the extra code in `Package._collectfile` was not covered/used.
@bluetech
Copy link
Member

The extra code if I see correctly is this:

        if self.fspath == path:  # __init__.py
            return [self]

Did you investigate why it was added and why it's not used?

@blueyed
Copy link
Contributor Author

blueyed commented Feb 28, 2020

@bluetech good call.
I've added it in fa35f65. The test from there started working without the patch with a6ff5e6 also shortly after.

#4319 was WIP when it was merged, and a6ff5e6 is from its cleanup: #4369. Codecov reported it there already, but it was missed / not looked at: https://codecov.io/gh/pytest-dev/pytest/compare/7ab3d818f03331ebf2765f6c4ea005b721b1c3fe...a6ff5e6bfc117f9151c6506a5f6f4bba51a1676c/changes

@blueyed blueyed merged commit f10ab02 into pytest-dev:master Feb 29, 2020
@blueyed blueyed deleted the package-_collectfile-upstream branch February 29, 2020 10:40
aklajnert pushed a commit to aklajnert/pytest that referenced this pull request Feb 29, 2020
Previously this was implemented both on `Session` and `Package`, where
the extra code in `Package._collectfile` was not covered/used.

Ref: pytest-dev#6830 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants