Conversation
4 tasks
3 tasks
1 task
This was referenced Jan 31, 2020
This reverts commit a3c8246, reversing changes made to 886b8d2. Ref: pytest-dev#5975 (comment) Conflicts: src/_pytest/main.py src/_pytest/unittest.py Squashed: 7c4b8a0 Revert "Node from parent (pytest-dev#5975)" 89abdb9 keep test, warning c9062ed warn via NodeMeta 149bddb keep/adjust testing/test_mark.py:1013::test_addmarker_order de91222 tests: handle DefinitionMock 9e3b17f fix testing/test_collection.py:453::TestSession::test_parsearg Conflicts: both modified: src/_pytest/nodes.py both modified: src/_pytest/python.py
Owner
Author
|
Squashed and rebased on my-master (old HEAD: c426585) |
1 task
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Ref: pytest-dev#6645
TODO:
Old description:
This reverts commit a3c8246, reversing
changes made to 886b8d2.
Ref: pytest-dev#5975 (comment)
Conflicts:
src/_pytest/main.py
src/_pytest/unittest.py
TODO:
from_config/from_parentfor compat? (likely only necessary when really used in the wild, and maybe it gets removed upstream later anyway, as I've meant in Node from parent pytest-dev/pytest#5975 (comment)).