-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
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
Fix handling of collect_ignore from parent conftest #4744
Conversation
I assume this fixes other similar issues. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great work @blueyed!
`_collectfile` should be called on files only. Fixes pytest-dev#4592.
8e95c45
to
913a2da
Compare
Codecov Report
@@ Coverage Diff @@
## master #4744 +/- ##
==========================================
+ Coverage 95.67% 95.67% +<.01%
==========================================
Files 113 113
Lines 24973 24984 +11
Branches 2480 2481 +1
==========================================
+ Hits 23892 23903 +11
- Misses 762 764 +2
+ Partials 319 317 -2
Continue to review full report at Codecov.
|
Build failure appears unrelated: https://travis-ci.org/pytest-dev/pytest/jobs/490660838 (pyinstaller) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
build failure is a known pip issue, based on context we can merge, great work
See #4751 for fixing the CI issue. |
In retrospect the asserts should have not been added to master (the bugfix release), but only to features. |
_collectfile
should be called on files only.Fixes #4592.
TODO:
[ ] remove assertions?