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.

Sign up for GitHub

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

Jump to bottom

Document #1540 #1541

Merged
merged 3 commits into from
May 19, 2016
Merged

Document #1540 #1541

merged 3 commits into from
May 19, 2016

Conversation

RonnyPfannschmidt
Copy link
Member

this pr ads a xfailing test for #1540 based on the bug report

fixing it is dependent on #1534 and followups

The-Compiler
The-Compiler reviewed Apr 28, 2016
View reviewed changes
testing/test_mark.py
@@ -563,6 +563,29 @@ def assert_markers(self, items, **expected):
if isinstance(v, MarkInfo)])
assert marker_names == set(expected_markers)

@pytest.mark.xfail(reason='callspec2.setmulti missuses keywords')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: missuses -> misuses

(TIL "missuses" is a colloquial form of "wives" too)

@nicoddemus
Copy link
Member

Nice work

@nicoddemus
Copy link
Member

Anything else here? Can we merge this?

@RonnyPfannschmidt
Copy link
Member Author

i was jsut waiting for someone to merge it

@nicoddemus
Copy link
Member

I guess everyone was waiting on the nitpick mentioned by @The-Compiler 😁

Feel free to go ahead if you don't have the time to fix it now, it is a nitpick after all

@RonnyPfannschmidt
Copy link
Member Author

i#ll fix it and do the merge :)

@RonnyPfannschmidt
Copy link
Member Author

@nicoddemus wasn't the py26 issue fixed ? or do we need that master merge finalized

@nicoddemus
Copy link
Member

Seems like it... do you have changes on tox.in in your branch perhaps?

@RonnyPfannschmidt
Copy link
Member Author

nah, this is features branch vs master branch :/

@nicoddemus
Copy link
Member

Oh wait, this PR is targeting features, didn't realize that. Then yes, we will need that merged first, but feel free to merge this now and get it out of your plate, we know the failure is unrelated. 😁

@RonnyPfannschmidt RonnyPfannschmidt merged commit be7a862 into pytest-dev:features May 19, 2016
@RonnyPfannschmidt RonnyPfannschmidt deleted the document-1540 branch May 19, 2016 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@RonnyPfannschmidt @nicoddemus @The-Compiler