Fix handling of collect_ignore from parent conftest#4744
Merged
Conversation
Contributor
Author
|
I assume this fixes other similar issues. |
nicoddemus
approved these changes
Feb 8, 2019
`_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.
|
Contributor
Author
|
Build failure appears unrelated: https://travis-ci.org/pytest-dev/pytest/jobs/490660838 (pyinstaller) |
RonnyPfannschmidt
approved these changes
Feb 8, 2019
RonnyPfannschmidt
left a comment
Member
There was a problem hiding this comment.
build failure is a known pip issue, based on context we can merge, great work
Contributor
Author
|
See #4751 for fixing the CI issue. |
Contributor
Author
|
In retrospect the asserts should have not been added to master (the bugfix release), but only to features. |
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
3 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.
_collectfileshould be called on files only.Fixes #4592.
TODO:
[ ] remove assertions?