Merge master into features #4360
Merged
Conversation
This file contains hidden or 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
As mentionned by @RonnyPfannschmidt, use set_blocked on module stepwise (and it's brother pytest_stepwise like consider_pluginarg method does)
`_collect_report_last_write` might be None, when `pytest_collection` was not called before. Not sure if this indicates another problem, but it can be reproduced with `testing/test_collection.py::TestCollector::()::test_getcustomfile_roundtrip`. Fixes pytest-dev#4329
Fix TypeError in report_collect with _collect_report_last_write
pytest-dev#4304 the stepwise plugin must be blocked on cacheprovider plugin block request
This reverts commit 28dbffd. Appears to be not necessary anymore: https://travis-ci.org/pytest-dev/pytest/jobs/452598885#L906 [skip appveyor]
Travis: fix MacOS py37 build
A set of minor changes from my Git stashes
tests: test_fileimport: improve reporting on failure
nicoddemus
approved these changes
Nov 9, 2018
RonnyPfannschmidt
approved these changes
Nov 9, 2018
asottile
approved these changes
Nov 9, 2018
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.
No description provided.