Skip to content

merge master into features #2222

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

Merged
merged 49 commits into from
Jan 26, 2017

Conversation

RonnyPfannschmidt
Copy link
Member

.

RonnyPfannschmidt and others added 30 commits December 6, 2016 09:13
Switch monkeypatch fixture to yield syntax
Otherwise it is not included by default as wheels do not honor the MANIFEST.in

Signed-off-by: Philippe Ombredanne <[email protected]>
Ensure the LICENSE is included in built wheels
Currently if the terminal report of testdir.runpytest() is missing,
assert_outcomes() on its output fails because parseoutcomes()
returns an unexpected value (None).
It's better to fail parseoutcomes() directly.
…-rewrite

Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite
…docs

Remove mention of --assert=reinterp in documentation
I cheated a little and updated the example output by hand. 😁

Fix pytest-dev#2200
…failure

Fail assert_outcomes() on missing terminal report
Assert statements of the pytester plugin again benefit from assertion rewriting

fixes pytest-dev#1920
todo: reenable in the features branch
Fix pytester internal plugin to work correctly with latest versions of zope.interface
fix pytest-dev#2118 - rework Node._getcustomclass and Node compat properties
due to a devpi bug, we always get a sdist install which in turn triggers
the pytest issue pytest-dev#2042 / pytest-dev#726

going for pyargs and a changed folder, it should no longer happen
(and will be tested firther after rebasing the release branch)
@coveralls
Copy link

Coverage Status

Coverage increased (+0.005%) to 92.724% when pulling 713bdc1 on RonnyPfannschmidt:features into 34e98bc on pytest-dev:features.

return getattr(pytest, name)
else:
cls = getattr(self, name)
# TODO: reenable in the features branch
Copy link
Member

Choose a reason for hiding this comment

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

Just a reminder of this, but I suggest doing it in a separate PR

@coveralls
Copy link

Coverage Status

Coverage increased (+0.005%) to 92.724% when pulling 3f30c22 on RonnyPfannschmidt:features into 34e98bc on pytest-dev:features.

Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

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

Looks good, nicely done

@RonnyPfannschmidt RonnyPfannschmidt merged commit 3b47cb4 into pytest-dev:features Jan 26, 2017
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.

10 participants