Force strict xfail on pytest, and update/remove tests accordingly#10526

Merged

uranusjr merged 5 commits intopypa:mainfrom uranusjr:remove-extra-merge-xfail

Sep 30, 2021

+19-17

Commits on Sep 29, 2021

Don't skip extra-merging test on 2020 resolver
uranusjr
committed