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

Assume not skipped by mark if attribute missing #3075

Merged

Conversation

elliterate
Copy link
Contributor

Fixes #3074.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 92.565% when pulling 25b504b on elliterate:bugs/fix-skipping-plugin-reporting into 0899727 on pytest-dev:master.

@elliterate
Copy link
Contributor Author

The build failures appear to be a combination of PyPI flakiness and unrelated test flakiness.

@RonnyPfannschmidt
Copy link
Member

the failures seem unrelated,

@@ -261,7 +261,7 @@ def pytest_runtest_makereport(item, call):
else:
rep.outcome = "passed"
rep.wasxfail = explanation
elif item._skipped_by_mark and rep.skipped and type(rep.longrepr) is tuple:
elif getattr(item, '_skipped_by_mark', False) and rep.skipped and type(rep.longrepr) is tuple:
Copy link
Contributor

Choose a reason for hiding this comment

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

Couldn't it be isinstance(rep.longrepr, tuple) ?

Copy link
Member

Choose a reason for hiding this comment

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

It could be, but I think it is fine to only expect only tuple types (as opposed to also expect tuple subclasses).

@nicoddemus nicoddemus merged commit bc66f7e into pytest-dev:master Jan 6, 2018
@nicoddemus
Copy link
Member

Thanks @elliterate and sorry for the delay!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants