Fix parameter handling of non-static test methods #13377
+52
−5
Merged
This check has been archived and is scheduled for deletion.
Learn more about checks retention
Patchback / Backport to 8.3.x
completed
Apr 18, 2025 in 7s
Backport to 8.3.x: 💔 cherry-picking failed — conflicts found
❌ Failed to cleanly apply 61c204a on top of patchback/backports/8.3.x/61c204a0355c89946cb0f3202820c5a0ec85e13d/pr-13377
Details
Backporting merged PR #13377 into main
- Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be youroriginremote. - Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the nameupstream. If you don't
have it, here's how you can add it:$ git remote add upstream https://github.com/pytest-dev/pytest.git - Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:$ git fetch upstream $ git checkout -b patchback/backports/8.3.x/61c204a0355c89946cb0f3202820c5a0ec85e13d/pr-13377 upstream/8.3.x
- Now, cherry-pick PR #13377 contents into that branch:
If it'll yell at you with something like
$ git cherry-pick -x 61c204a0355c89946cb0f3202820c5a0ec85e13dfatal: Commit 61c204a0355c89946cb0f3202820c5a0ec85e13d is a merge but no -m option was given., add-m 1as follows instead:$ git cherry-pick -m1 -x 61c204a0355c89946cb0f3202820c5a0ec85e13d - At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR #13377 as close to the
original as possible. - Push this branch to your fork on GitHub:
$ git push origin patchback/backports/8.3.x/61c204a0355c89946cb0f3202820c5a0ec85e13d/pr-13377 - Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!
Loading