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 collection of symlinked files #4337

Merged
merged 1 commit into from
Nov 11, 2018
Merged

Conversation

blueyed
Copy link
Contributor

@blueyed blueyed commented Nov 8, 2018

@blueyed blueyed changed the title Fix collection of direct symlinked files [WIP] Fix collection of direct symlinked files Nov 8, 2018
@blueyed blueyed changed the title [WIP] Fix collection of direct symlinked files Fix collection of direct symlinked files Nov 8, 2018
@codecov
Copy link

codecov bot commented Nov 8, 2018

Codecov Report

Merging #4337 into master will decrease coverage by <.01%.
The diff coverage is 96.29%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4337      +/-   ##
==========================================
- Coverage   95.85%   95.84%   -0.01%     
==========================================
  Files         111      111              
  Lines       24910    25071     +161     
  Branches     2431     2448      +17     
==========================================
+ Hits        23877    24029     +152     
- Misses        736      745       +9     
  Partials      297      297
Flag Coverage Δ
#docs 28.88% <37.03%> (ø) ⬆️
#doctesting 28.88% <37.03%> (ø) ⬆️
#linting 28.88% <37.03%> (ø) ⬆️
#linux 95.61% <96.29%> (-0.03%) ⬇️
#nobyte 91.83% <96.29%> (-0.02%) ⬇️
#numpy 92.38% <77.77%> (-0.63%) ⬇️
#pexpect 41.64% <44.44%> (+0.01%) ⬆️
#py27 94.01% <96.29%> (-0.02%) ⬇️
#py34 92.14% <96.29%> (+0.04%) ⬆️
#py35 92.15% <96.29%> (+0.05%) ⬆️
#py36 93.92% <96.29%> (+0.02%) ⬆️
#py37 92.19% <96.29%> (+0.05%) ⬆️
#trial 92.38% <77.77%> (-0.63%) ⬇️
#windows 93.97% <77.77%> (+0.01%) ⬆️
#xdist 93.73% <96.29%> (-0.01%) ⬇️
Impacted Files Coverage Δ
src/_pytest/config/__init__.py 95.02% <100%> (ø) ⬆️
src/_pytest/main.py 96.88% <100%> (-0.01%) ⬇️
testing/test_collection.py 99.78% <100%> (ø) ⬆️
src/_pytest/config/findpaths.py 94.11% <92.85%> (-0.73%) ⬇️
testing/test_modimport.py 69.23% <0%> (-12.59%) ⬇️
testing/test_argcomplete.py 66.66% <0%> (-1.45%) ⬇️
src/_pytest/capture.py 93.42% <0%> (-0.46%) ⬇️
src/_pytest/python.py 95.27% <0%> (-0.25%) ⬇️
testing/test_session.py 96.5% <0%> (ø) ⬆️
testing/test_nodes.py 100% <0%> (ø) ⬆️
... and 1 more

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 7ab3d81...be15ad8. Read the comment docs.

@Lekensteyn
Copy link

#4321 is not completely solved by this patch, see #4321 (comment) for a reproducer. The leading colons (::) are gone, but the symlink name is unexpectedly included in the nodeid.

@blueyed blueyed changed the title Fix collection of direct symlinked files [WIP] Fix collection of direct symlinked files Nov 8, 2018
@blueyed blueyed changed the title [WIP] Fix collection of direct symlinked files [WIP] Fix collection of symlinked files Nov 8, 2018
@blueyed blueyed changed the title [WIP] Fix collection of symlinked files Fix collection of symlinked files Nov 11, 2018
@blueyed
Copy link
Contributor Author

blueyed commented Nov 11, 2018

@nicoddemus
Please merge if it is OK with you.

@nicoddemus nicoddemus merged commit e5a9f92 into pytest-dev:master Nov 11, 2018
@nicoddemus
Copy link
Member

Awesome, thanks!

@blueyed blueyed mentioned this pull request May 15, 2019
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.

None yet

3 participants