Refactor direct fixture call warning to avoid incompatibility with plugins #3754
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
Callek
reviewed
Aug 1, 2018
changelog/3747.bugfix.rst
Outdated
| @@ -0,0 +1 @@ | |||
| Fix compatibility problem with plugins and the the warning code issued by fixture functions when they are called directly. | |||
|
Hmmm 2 failing tests on py27, I will take a look at them tomorrow if the current approach is considered sound by others. |
| @@ -249,6 +249,21 @@ def get_real_func(obj): | |||
| return obj | |||
|
|
|||
|
|
|||
| def get_real_method(obj, holder): | |||
There was a problem hiding this comment.
this needs to handle __wrapped__ on python2
There was a problem hiding this comment.
Hmm get_real_func already handles __wrapped__. Can you clarify this a bit?
There was a problem hiding this comment.
@nicoddemus my understanding is that method descriptors are not exposing it readily, i will investigate in a bit
…ugins This refactors the code so we have the real function object right during collection. This avoids having to unwrap it later and lose attached information such as "async" functions. Fix pytest-dev#3747
nicoddemus
force-pushed
the
fix-function-call-warning
branch
from
1228b41
to
c6b11b9
Compare
nicoddemus
commented
Aug 1, 2018
| # during fixture definition we wrap the original fixture function | ||
| # to issue a warning if called directly, so here we unwrap it in order to not emit the warning | ||
| # when pytest itself calls the fixture function | ||
| if six.PY2 and unittest: |
There was a problem hiding this comment.
This was the best I could come with; unbound methods are a headache to deal here.
There was a problem hiding this comment.
cant wait for the python2 drop ^^
RonnyPfannschmidt
approved these changes
Aug 2, 2018
Merged
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.
This refactors the code so we have the real function object right during
collection. This avoids having to unwrap it later and lose attached information
such as "async" functions.
I've tested this with
pytest-asyncioand it fixes pytest-dev/pytest-asyncio#89.Fix #3747, Fix #3720
Fix pytest-dev/pytest-asyncio#89