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.

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

Merged
merged 1 commit into from
Feb 8, 2019

Conversation

blueyed
Copy link
Contributor

@blueyed blueyed commented Feb 8, 2019

_collectfile should be called on files only.

Fixes #4592.

TODO:

  • squash
  • [ ] remove assertions?

@blueyed
Copy link
Contributor Author

blueyed commented Feb 8, 2019

I assume this fixes other similar issues.

Copy link
Member

@nicoddemus nicoddemus left a 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.
@blueyed blueyed force-pushed the fix-4592-collectfile branch from 8e95c45 to 913a2da Compare February 8, 2019 17:46
@codecov
Copy link

codecov bot commented Feb 8, 2019

Codecov Report

Merging #4744 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            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
Flag Coverage Δ
#docs 29.57% <46.66%> (-0.01%) ⬇️
#doctesting 29.57% <46.66%> (-0.01%) ⬇️
#linting 29.57% <46.66%> (-0.01%) ⬇️
#linux 95.5% <100%> (ø) ⬆️
#nobyte 91.66% <100%> (-0.62%) ⬇️
#numpy 42.06% <26.66%> (-51.03%) ⬇️
#pexpect 42.06% <26.66%> (-0.02%) ⬇️
#py27 93.69% <100%> (+0.03%) ⬆️
#py34 91.65% <100%> (-0.05%) ⬇️
#py35 91.65% <100%> (-0.05%) ⬇️
#py36 91.63% <100%> (-0.11%) ⬇️
#py37 93.77% <100%> (-0.04%) ⬇️
#trial 42.06% <26.66%> (-51.03%) ⬇️
#windows 93.16% <100%> (-0.7%) ⬇️
#xdist 93.72% <100%> (+0.02%) ⬆️
Impacted Files Coverage Δ
src/_pytest/python.py 92.67% <100%> (+0.26%) ⬆️
src/_pytest/main.py 95.93% <100%> (ø) ⬆️
testing/test_collection.py 99.79% <100%> (ø) ⬆️
src/_pytest/capture.py 93.66% <0%> (-0.46%) ⬇️
src/_pytest/pytester.py 87% <0%> (-0.43%) ⬇️
src/_pytest/cacheprovider.py 97.16% <0%> (+1.41%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ea73246...913a2da. Read the comment docs.

@blueyed blueyed added type: bug problem that needs to be addressed topic: collection related to the collection phase labels Feb 8, 2019
@blueyed
Copy link
Contributor Author

blueyed commented Feb 8, 2019

Build failure appears unrelated: https://travis-ci.org/pytest-dev/pytest/jobs/490660838 (pyinstaller)

Copy link
Member

@RonnyPfannschmidt RonnyPfannschmidt left a 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

@blueyed blueyed merged commit 5ca8159 into pytest-dev:master Feb 8, 2019
@blueyed blueyed deleted the fix-4592-collectfile branch February 8, 2019 19:58
@blueyed
Copy link
Contributor Author

blueyed commented Feb 8, 2019

See #4751 for fixing the CI issue.

@blueyed
Copy link
Contributor Author

blueyed commented Feb 13, 2019

In retrospect the asserts should have not been added to master (the bugfix release), but only to features.
(causing #4782)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic: collection related to the collection phase type: bug problem that needs to be addressed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants