Fix nodes._check_initialpaths_for_relpath for dirs #4352
Merged
Conversation
This file contains 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
blueyed
force-pushed
the
_check_initialpaths_for_relpath
branch
from
8baeb90
to
8532756
Compare
Codecov Report
@@ Coverage Diff @@
## master #4352 +/- ##
==========================================
+ Coverage 95.85% 95.85% +<.01%
==========================================
Files 111 111
Lines 24895 24907 +12
Branches 2431 2431
==========================================
+ Hits 23862 23874 +12
Misses 736 736
Partials 297 297
Continue to review full report at Codecov.
|
blueyed
commented
Nov 9, 2018
| "*test_world.py::test_other*PASSED*", | ||
| "*4 passed*", | ||
| "test_hello.py::test_hello*PASSED*", | ||
| "test_hello.py::test_other*PASSED*", |
There was a problem hiding this comment.
Before this fix there was "hello/" here.
blueyed
commented
Nov 9, 2018
| ["*rootdir: {}/root, inifile:*".format(testdir.tmpdir), "*1 passed*"] | ||
| [ | ||
| "*rootdir: {}/root, inifile:*".format(testdir.tmpdir), | ||
| "root/test_rootdir_option_arg.py *", |
There was a problem hiding this comment.
Before the fix this was root/test_rootdir_option_argX/test_rootdir_option_arg.py.
blueyed
commented
Nov 9, 2018
src/_pytest/nodes.py
Outdated
| @@ -447,6 +447,8 @@ def _prunetraceback(self, excinfo): | |||
| def _check_initialpaths_for_relpath(session, fspath): | |||
| for initial_path in session._initialpaths: | |||
| if fspath.common(initial_path) == initial_path: | |||
| if initial_path.isdir(): | |||
| return fspath.relto(initial_path) | |||
| return fspath.relto(initial_path.dirname) | |||
There was a problem hiding this comment.
According to codecov only the isdir (new) path is covered: https://codecov.io/gh/pytest-dev/pytest/commit/8532756fe549edb6ecb01733f33f714cebdc35b2#D1-450
There was a problem hiding this comment.
And looking closer it shows that it can only really be a dir here, if it shares a / is the common path with fspath, no?
Ref: pytest-dev#4321 (comment) Hardens some of the not many tests affected by this: 1. `testing/test_session.py::test_rootdir_option_arg` displayed: > root/test_rootdir_option_arg2/test_rootdir_option_arg.py 2. `test_cmdline_python_namespace_package` displayed "hello/" prefix for: > hello/test_hello.py::test_hello > hello/test_hello.py::test_other
blueyed
force-pushed
the
_check_initialpaths_for_relpath
branch
from
8532756
to
bee72a6
Compare
blueyed
added
type: bug
RonnyPfannschmidt
approved these changes
Nov 9, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Ref: #4321 (comment)