From 8586098b183dddbb01debf748c402d9a37f931d9 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Mon, 25 May 2020 21:18:24 +0800 Subject: [PATCH 1/2] These tests should pass now --- tests/functional/test_install_extras.py | 1 - tests/functional/test_install_reqs.py | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/functional/test_install_extras.py b/tests/functional/test_install_extras.py index dfde7d1b676..3c0359a73f1 100644 --- a/tests/functional/test_install_extras.py +++ b/tests/functional/test_install_extras.py @@ -136,7 +136,6 @@ def test_install_special_extra(script): pytest.param('[extra2]', '1.0', marks=pytest.mark.xfail), pytest.param('[extra1,extra2]', '1.0', marks=pytest.mark.xfail), ]) -@pytest.mark.fails_on_new_resolver def test_install_extra_merging(script, data, extra_to_install, simple_version): # Check that extra specifications in the extras section are honoured. pkga_path = script.scratch_path / 'pkga' diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py index d39263b98ea..ae9be4a2ffc 100644 --- a/tests/functional/test_install_reqs.py +++ b/tests/functional/test_install_reqs.py @@ -189,7 +189,6 @@ def test_respect_order_in_requirements_file(script, data): ) -@pytest.mark.fails_on_new_resolver def test_install_local_editable_with_extras(script, data): to_install = data.packages.joinpath("LocalExtras") res = script.pip_install_local( From 71511afb97ad1b57e99dc6b3ad20f75a43f4b9df Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Mon, 25 May 2020 22:13:48 +0800 Subject: [PATCH 2/2] This should pass as well --- tests/functional/test_install.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index 4decbd2d81f..e6aa1043cb1 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -148,7 +148,6 @@ def test_pep518_with_user_pip(script, pip_src, data, common_wheels): ) -@pytest.mark.fails_on_new_resolver def test_pep518_with_extra_and_markers(script, data, common_wheels): script.pip( 'wheel', '--no-index',