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.

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

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

Merged
merged 5 commits into from
Sep 30, 2021

Conversation

uranusjr
Copy link
Member

These should not fail with the new resolver, so don't skip them.

@uranusjr uranusjr added the skip news Does not need a NEWS file entry (eg: trivial changes) label Sep 29, 2021
@pradyunsg
Copy link
Member

While we're at it, I wonder if we should set xfail_strict = true for pytest?

It can be done through [tool.pytest.ini_options] -- see https://docs.pytest.org/en/6.2.x/reference.html#confval-xfail_strict.

@uranusjr
Copy link
Member Author

Let me try if it fails any other tests.

@uranusjr uranusjr marked this pull request as draft September 30, 2021 07:20
The option is current restored. We should remove this test after the
option is removed (again).
@uranusjr
Copy link
Member Author

Seems to work with not many more changes. Two tests need special attention: test_respect_order_in_requirements_file is xpass but I don't even understand why it's marked as xfail in the first place; test_no_clean_option_blocks_cleaning_after_wheel will need to be handled carefully in conjunction to #10485.

@uranusjr uranusjr marked this pull request as ready for review September 30, 2021 08:28
@pradyunsg pradyunsg changed the title Don't skip extra-merging test on 2020 resolver Force strict xfail on pytest, and update/remove tests accordingly Sep 30, 2021
@pradyunsg
Copy link
Member

I'd prefer we merge this, and then deal with the fallout in that one. It already needs updating for a bunch of CI stuff (docs build) anyway.

@uranusjr uranusjr merged commit cb2d4b8 into pypa:main Sep 30, 2021
@uranusjr uranusjr deleted the remove-extra-merge-xfail branch September 30, 2021 08:34
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
skip news Does not need a NEWS file entry (eg: trivial changes)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants