Skip to content

[release notes] Merge pull request #5379 from asottile/release-4.6.2#5380

Merged
nicoddemus merged 1 commit intopytest-dev:masterfrom
asottile:cherry-pick-maintenance-release
Jun 3, 2019
Merged

[release notes] Merge pull request #5379 from asottile/release-4.6.2#5380
nicoddemus merged 1 commit intopytest-dev:masterfrom
asottile:cherry-pick-maintenance-release

Conversation

@asottile
Copy link
Member

@asottile asottile commented Jun 3, 2019

Preparing release version 4.6.2

Preparing release version 4.6.2
@asottile asottile changed the title Merge pull request #5379 from asottile/release-4.6.2 [release notes] Merge pull request #5379 from asottile/release-4.6.2 Jun 3, 2019
@nicoddemus
Copy link
Member

Thanks for picking this up; got dragged to a meeting so I couldn't finish it off. 😁

@nicoddemus nicoddemus merged commit 927e95c into pytest-dev:master Jun 3, 2019
@asottile asottile deleted the cherry-pick-maintenance-release branch June 3, 2019 21:01
@asottile
Copy link
Member Author

asottile commented Jun 3, 2019

Thanks for picking this up; got dragged to a meeting so I couldn't finish it off. grin

all good! happy to do it :D

HarshitZom added a commit to HarshitZom/pytest that referenced this pull request Nov 23, 2025
Previously, dynamically adding an xfail marker during test execution did not mark the test as xfailed in pytest 6.x, causing failures instead. Now, xfail markers added in the test body are respected, matching pytest 5.x behavior.

Closes pytest-dev#5380
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants