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.

Sign up for GitHub

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

Jump to bottom

WIP: minor/misc cherry-picks #399

Open
wants to merge 4 commits into
base: my-master
Choose a base branch
from
Open

WIP: minor/misc cherry-picks #399

wants to merge 4 commits into from

Conversation

blueyed
Copy link
Owner

@blueyed blueyed commented Jul 18, 2020

No description provided.

@blueyed blueyed force-pushed the cherries branch 2 times, most recently from 4ae49b2 to 6f1b915 Compare September 16, 2020 13:21
bluetech and others added 4 commits September 2, 2021 01:29
@bluetech @blueyed
Replace yield_fixture -> fixture in internal code
1b3a681 
`yield_fixture` is a deprecated alias to `fixture`.

(cherry picked from commit f00bec2)

Conflicts:
	testing/example_scripts/issue_519.py
	testing/test_pathlib.py
@bluetech @blueyed
Remove broken _reprcompare disabling fixture in test_assertrewrite.py
d40e730 
The `_pytest._code._reprcompare` that was referred to previously doesn't
exist -- it was moved to other places but wasn't updated. This regressed
in f423ce9. Now we don't want it
anymore, so keep the status quo by explicitly removing them.

(cherry picked from commit 8fab3dd)
@bluetech @blueyed
Remove some no-longer-needed compat code in test_assertion
18256f0 
(cherry picked from commit 20956b2)
@kerizane @blueyed
Use internal version of make_numbered_dir
200c0c1 
(cherry picked from commit 678440e)

Conflicts:
	src/_pytest/pytester/__init__.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@blueyed @bluetech @kerizane