support pytest-xdist 2 #861
Merged
Conversation
This file contains 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
bluetech
reviewed
Aug 16, 2020
| @@ -46,7 +46,7 @@ def django_db_modify_db_settings_tox_suffix(): | |||
| def django_db_modify_db_settings_xdist_suffix(request): | |||
| skip_if_no_django() | |||
|
|
|||
| xdist_suffix = getattr(request.config, "slaveinput", {}).get("slaveid") | |||
| xdist_suffix = getattr(request.config, "workerinput", {}).get("workerid") | |||
There was a problem hiding this comment.
I haven't followed the slave/worker work, but is it safe to just switch, or should we keep compatibility with the old names for a while? I.e. like this:
Suggested change
| xdist_suffix = getattr(request.config, "workerinput", {}).get("workerid") | |
| workerinput = getattr(request.config, "workerinput", getattr(request.config, "slaveinput", {})) | |
| xdist_suffix = workerinput.get("workerid", workerinput.get("slaveid")) |
There was a problem hiding this comment.
pytest-cov switched wholesale, so I think pytest-django should too
There was a problem hiding this comment.
Right, looks like it should be fine from the graph provided in pytest-dev/pytest-cov#412 (comment).
bluetech
approved these changes
Aug 16, 2020
rixx
added a commit
to pretalx/pretalx
that referenced
this pull request
Aug 19, 2020
Wait for a new pytest-django release, which supports pytest-xdist~=2.0 as per pytest-dev/pytest-django#861
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.
Fixes #860