fix addmarker - extract mark from markdecorator #3577
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
RonnyPfannschmidt
force-pushed
the
addmarker-fix
branch
from
282b5b8
to
37793d4
Compare
RonnyPfannschmidt
changed the title
nicoddemus
reviewed
Jun 12, 2018
src/_pytest/mark/structures.py
Outdated
| def validate_marks(self, attribute, value): | ||
| for item in value: | ||
| if not isinstance(item, Mark): | ||
| raise ValueError(item) |
There was a problem hiding this comment.
Please add a more descriptive message:
raise ValueError('MarkInfo expects Mark instances, got {!r} (!{r})'.format(item, type(item)))
src/_pytest/nodes.py
Outdated
| @@ -173,10 +173,12 @@ def listchain(self): | |||
| chain.reverse() | |||
| return chain | |||
|
|
|||
| def add_marker(self, marker): | |||
| def add_marker(self, marker, append=True): | |||
There was a problem hiding this comment.
whops, the docstring and parames didnt get undone
RonnyPfannschmidt
force-pushed
the
addmarker-fix
branch
from
0d589ab
to
b0ec442
Compare
|
TestMockDecoration.test_wrapped_getfuncargnames_patching looks fundamentally broken |
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.
fixes #3555