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 addmarker - extract mark from markdecorator #3577

Merged
merged 5 commits into from Jun 13, 2018

Conversation

Projects
None yet
3 participants
@RonnyPfannschmidt
Copy link
Member

RonnyPfannschmidt commented Jun 12, 2018

fixes #3555

@RonnyPfannschmidt RonnyPfannschmidt requested a review from nicoddemus Jun 12, 2018

@RonnyPfannschmidt RonnyPfannschmidt force-pushed the RonnyPfannschmidt:addmarker-fix branch from 282b5b8 to 37793d4 Jun 12, 2018

@RonnyPfannschmidt RonnyPfannschmidt changed the title [WIP] fix addmarker - extract mark from markdecorator fix addmarker - extract mark from markdecorator Jun 12, 2018

def validate_marks(self, attribute, value):
for item in value:
if not isinstance(item, Mark):
raise ValueError(item)

This comment has been minimized.

Copy link
@nicoddemus

nicoddemus Jun 12, 2018

Member

Please add a more descriptive message:

raise ValueError('MarkInfo expects Mark instances, got {!r} (!{r})'.format(item, type(item)))
@@ -173,10 +173,12 @@ def listchain(self):
chain.reverse()
return chain

def add_marker(self, marker):
def add_marker(self, marker, append=True):

This comment has been minimized.

Copy link
@RonnyPfannschmidt

RonnyPfannschmidt Jun 12, 2018

Author Member

whops, the docstring and parames didnt get undone

@RonnyPfannschmidt RonnyPfannschmidt force-pushed the RonnyPfannschmidt:addmarker-fix branch from 0d589ab to b0ec442 Jun 12, 2018

@nicoddemus
Copy link
Member

nicoddemus left a comment

Awesome, thanks!

@RonnyPfannschmidt

This comment has been minimized.

Copy link
Member Author

RonnyPfannschmidt commented Jun 12, 2018

TestMockDecoration.test_wrapped_getfuncargnames_patching looks fundamentally broken

@coveralls

This comment has been minimized.

Copy link

coveralls commented Jun 12, 2018

Coverage Status

Coverage increased (+0.03%) to 92.708% when pulling 88ae21f on RonnyPfannschmidt:addmarker-fix into 1b5322d on pytest-dev:master.

@nicoddemus nicoddemus merged commit 4d0297b into pytest-dev:master Jun 13, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@RonnyPfannschmidt RonnyPfannschmidt deleted the RonnyPfannschmidt:addmarker-fix branch Aug 2, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.