McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Switch to resolver variants in the test suite

This commit is contained in:
Pradyun Gedam 2020-10-30 05:58:02 +05:30
parent 6028e6a0fb
commit 5cba61e118
No known key found for this signature in database
GPG Key ID: FF99710C4332258E
5 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/conftest.py
View File

@ -103,17 +103,20 @@ def pytest_collection_modifyitems(config, items):
@pytest.fixture(scope="session", autouse=True)
def use_new_resolver(request):
"""Set environment variable to make pip default to the new resolver.
def resolver_variant(request):
"""Set environment variable to make pip default to the correct resolver.
"""
new_resolver = request.config.getoption("--new-resolver")
features = set(os.environ.get("PIP_USE_FEATURE", "").split())
if new_resolver:
retval = "2020-resolver"
features.add("2020-resolver")
else:
retval = "legacy"
features.discard("2020-resolver")
with patch.dict(os.environ, {"PIP_USE_FEATURE": " ".join(features)}):
yield new_resolver
yield retval
@pytest.fixture(scope='session')

22
tests/functional/test_install.py
View File

@ -941,7 +941,7 @@ def test_install_nonlocal_compatible_wheel(script, data):
def test_install_nonlocal_compatible_wheel_path(
script,
data,
use_new_resolver
resolver_variant,
):
target_dir = script.scratch_path / 'target'
@ -952,9 +952,9 @@ def test_install_nonlocal_compatible_wheel_path(
'--no-index',
'--only-binary=:all:',
Path(data.packages) / 'simplewheel-2.0-py3-fakeabi-fakeplat.whl',
expect_error=use_new_resolver
expect_error=(resolver_variant == "2020-resolver"),
)
if use_new_resolver:
if resolver_variant == "2020-resolver":
assert result.returncode == ERROR
else:
assert result.returncode == SUCCESS
@ -1456,7 +1456,7 @@ def test_install_no_binary_disables_cached_wheels(script, data, with_wheel):
assert "Running setup.py install for upper" in str(res), str(res)
def test_install_editable_with_wrong_egg_name(script, use_new_resolver):
def test_install_editable_with_wrong_egg_name(script, resolver_variant):
script.scratch_path.joinpath("pkga").mkdir()
pkga_path = script.scratch_path / 'pkga'
pkga_path.joinpath("setup.py").write_text(textwrap.dedent("""
@ -1467,12 +1467,12 @@ def test_install_editable_with_wrong_egg_name(script, use_new_resolver):
result = script.pip(
'install', '--editable',
'file://{pkga_path}#egg=pkgb'.format(**locals()),
expect_error=use_new_resolver,
expect_error=(resolver_variant == "2020-resolver"),
)
assert ("Generating metadata for package pkgb produced metadata "
"for project name pkga. Fix your #egg=pkgb "
"fragments.") in result.stderr
if use_new_resolver:
if resolver_variant == "2020-resolver":
assert "has different name in metadata" in result.stderr, str(result)
else:
assert "Successfully installed pkga" in str(result), str(result)
@ -1505,7 +1505,7 @@ def test_double_install(script):
assert msg not in result.stderr
def test_double_install_fail(script, use_new_resolver):
def test_double_install_fail(script, resolver_variant):
"""
Test double install failing with two different version requirements
"""
@ -1514,9 +1514,9 @@ def test_double_install_fail(script, use_new_resolver):
'pip==7.*',
'pip==7.1.2',
# The new resolver is perfectly capable of handling this
expect_error=(not use_new_resolver)
expect_error=(resolver_variant == "legacy"),
)
if not use_new_resolver:
if resolver_variant == "legacy":
msg = ("Double requirement given: pip==7.1.2 (already in pip==7.*, "
"name='pip')")
assert msg in result.stderr
@ -1770,11 +1770,11 @@ def test_user_config_accepted(script):
)
@pytest.mark.parametrize("use_module", [True, False])
def test_install_pip_does_not_modify_pip_when_satisfied(
script, install_args, expected_message, use_module, use_new_resolver):
script, install_args, expected_message, use_module, resolver_variant):
"""
Test it doesn't upgrade the pip if it already satisfies the requirement.
"""
variation = "satisfied" if use_new_resolver else "up-to-date"
variation = "satisfied" if resolver_variant else "up-to-date"
expected_message = expected_message.format(variation)
result = script.pip_install_local(
'pip', *install_args, use_module=use_module

48
tests/functional/test_install_reqs.py
View File

@ -376,7 +376,7 @@ def test_constraints_local_install_causes_error(script, data):
def test_constraints_constrain_to_local_editable(
script,
data,
use_new_resolver
resolver_variant,
):
to_install = data.src.joinpath("singlemodule")
script.scratch_path.joinpath("constraints.txt").write_text(
@ -386,15 +386,15 @@ def test_constraints_constrain_to_local_editable(
'install', '--no-index', '-f', data.find_links, '-c',
script.scratch_path / 'constraints.txt', 'singlemodule',
allow_stderr_warning=True,
expect_error=use_new_resolver
expect_error=(resolver_variant == "2020-resolver"),
)
if use_new_resolver:
if resolver_variant == "2020-resolver":
assert 'Links are not allowed as constraints' in result.stderr
else:
assert 'Running setup.py develop for singlemodule' in result.stdout
def test_constraints_constrain_to_local(script, data, use_new_resolver):
def test_constraints_constrain_to_local(script, data, resolver_variant):
to_install = data.src.joinpath("singlemodule")
script.scratch_path.joinpath("constraints.txt").write_text(
"{url}#egg=singlemodule".format(url=path_to_url(to_install))
@ -403,15 +403,15 @@ def test_constraints_constrain_to_local(script, data, use_new_resolver):
'install', '--no-index', '-f', data.find_links, '-c',
script.scratch_path / 'constraints.txt', 'singlemodule',
allow_stderr_warning=True,
expect_error=use_new_resolver
expect_error=(resolver_variant == "2020-resolver"),
)
if use_new_resolver:
if resolver_variant == "2020-resolver":
assert 'Links are not allowed as constraints' in result.stderr
else:
assert 'Running setup.py install for singlemodule' in result.stdout
def test_constrained_to_url_install_same_url(script, data, use_new_resolver):
def test_constrained_to_url_install_same_url(script, data, resolver_variant):
to_install = data.src.joinpath("singlemodule")
constraints = path_to_url(to_install) + "#egg=singlemodule"
script.scratch_path.joinpath("constraints.txt").write_text(constraints)
@ -419,9 +419,9 @@ def test_constrained_to_url_install_same_url(script, data, use_new_resolver):
'install', '--no-index', '-f', data.find_links, '-c',
script.scratch_path / 'constraints.txt', to_install,
allow_stderr_warning=True,
expect_error=use_new_resolver
expect_error=(resolver_variant == "2020-resolver"),
)
if use_new_resolver:
if resolver_variant == "2020-resolver":
assert 'Links are not allowed as constraints' in result.stderr
else:
assert ('Running setup.py install for singlemodule'
@ -462,7 +462,7 @@ def test_double_install_spurious_hash_mismatch(
assert 'Successfully installed simple-1.0' in str(result)
def test_install_with_extras_from_constraints(script, data, use_new_resolver):
def test_install_with_extras_from_constraints(script, data, resolver_variant):
to_install = data.packages.joinpath("LocalExtras")
script.scratch_path.joinpath("constraints.txt").write_text(
"{url}#egg=LocalExtras[bar]".format(url=path_to_url(to_install))
@ -470,9 +470,9 @@ def test_install_with_extras_from_constraints(script, data, use_new_resolver):
result = script.pip_install_local(
'-c', script.scratch_path / 'constraints.txt', 'LocalExtras',
allow_stderr_warning=True,
expect_error=use_new_resolver
expect_error=(resolver_variant == "2020-resolver"),
)
if use_new_resolver:
if resolver_variant == "2020-resolver":
assert 'Links are not allowed as constraints' in result.stderr
else:
result.did_create(script.site_packages / 'simple')
@ -494,7 +494,7 @@ def test_install_with_extras_from_install(script):
result.did_create(script.site_packages / 'singlemodule.py')
def test_install_with_extras_joined(script, data, use_new_resolver):
def test_install_with_extras_joined(script, data, resolver_variant):
to_install = data.packages.joinpath("LocalExtras")
script.scratch_path.joinpath("constraints.txt").write_text(
"{url}#egg=LocalExtras[bar]".format(url=path_to_url(to_install))
@ -502,16 +502,16 @@ def test_install_with_extras_joined(script, data, use_new_resolver):
result = script.pip_install_local(
'-c', script.scratch_path / 'constraints.txt', 'LocalExtras[baz]',
allow_stderr_warning=True,
expect_error=use_new_resolver
expect_error=(resolver_variant == "2020-resolver"),
)
if use_new_resolver:
if resolver_variant == "2020-resolver":
assert 'Links are not allowed as constraints' in result.stderr
else:
result.did_create(script.site_packages / 'simple')
result.did_create(script.site_packages / 'singlemodule.py')
def test_install_with_extras_editable_joined(script, data, use_new_resolver):
def test_install_with_extras_editable_joined(script, data, resolver_variant):
to_install = data.packages.joinpath("LocalExtras")
script.scratch_path.joinpath("constraints.txt").write_text(
"-e {url}#egg=LocalExtras[bar]".format(url=path_to_url(to_install))
@ -519,9 +519,9 @@ def test_install_with_extras_editable_joined(script, data, use_new_resolver):
result = script.pip_install_local(
'-c', script.scratch_path / 'constraints.txt', 'LocalExtras[baz]',
allow_stderr_warning=True,
expect_error=use_new_resolver
expect_error=(resolver_variant == "2020-resolver"),
)
if use_new_resolver:
if resolver_variant == "2020-resolver":
assert 'Links are not allowed as constraints' in result.stderr
else:
result.did_create(script.site_packages / 'simple')
@ -550,7 +550,7 @@ def test_install_distribution_duplicate_extras(script, data):
def test_install_distribution_union_with_constraints(
script,
data,
use_new_resolver
resolver_variant,
):
to_install = data.packages.joinpath("LocalExtras")
script.scratch_path.joinpath("constraints.txt").write_text(
@ -558,9 +558,9 @@ def test_install_distribution_union_with_constraints(
result = script.pip_install_local(
'-c', script.scratch_path / 'constraints.txt', to_install + '[baz]',
allow_stderr_warning=True,
expect_error=use_new_resolver
expect_error=(resolver_variant == "2020-resolver"),
)
if use_new_resolver:
if resolver_variant == "2020-resolver":
msg = 'Unnamed requirements are not allowed as constraints'
assert msg in result.stderr
else:
@ -571,16 +571,16 @@ def test_install_distribution_union_with_constraints(
def test_install_distribution_union_with_versions(
script,
data,
use_new_resolver,
resolver_variant,
):
to_install_001 = data.packages.joinpath("LocalExtras")
to_install_002 = data.packages.joinpath("LocalExtras-0.0.2")
result = script.pip_install_local(
to_install_001 + "[bar]",
to_install_002 + "[baz]",
expect_error=use_new_resolver,
expect_error=(resolver_variant == "2020-resolver"),
)
if use_new_resolver:
if resolver_variant == "2020-resolver":
assert (
"Cannot install localextras[bar] 0.0.1 and localextras[baz] 0.0.2 "
"because these package versions have conflicting dependencies."

8
tests/functional/test_install_upgrade.py
View File

@ -40,7 +40,7 @@ def test_invalid_upgrade_strategy_causes_error(script):
def test_only_if_needed_does_not_upgrade_deps_when_satisfied(
script,
use_new_resolver,
resolver_variant,
with_wheel
):
"""
@ -62,7 +62,7 @@ def test_only_if_needed_does_not_upgrade_deps_when_satisfied(
), "should not have uninstalled simple==2.0"
msg = "Requirement already satisfied"
if not use_new_resolver:
if resolver_variant == "legacy":
msg = msg + ", skipping upgrade: simple"
assert (
msg in result.stdout
@ -184,7 +184,7 @@ def test_upgrade_if_requested(script, with_wheel):
)
def test_upgrade_with_newest_already_installed(script, data, use_new_resolver):
def test_upgrade_with_newest_already_installed(script, data, resolver_variant):
"""
If the newest version of a package is already installed, the package should
not be reinstalled and the user should be informed.
@ -194,7 +194,7 @@ def test_upgrade_with_newest_already_installed(script, data, use_new_resolver):
'install', '--upgrade', '-f', data.find_links, '--no-index', 'simple'
)
assert not result.files_created, 'simple upgraded when it should not have'
if use_new_resolver:
if resolver_variant == "2020-resolver":
msg = "Requirement already satisfied"
else:
msg = "already up-to-date"

4
tests/functional/test_wheel.py
View File

@ -193,7 +193,7 @@ def test_pip_wheel_fail(script, data):
def test_no_clean_option_blocks_cleaning_after_wheel(
script,
data,
use_new_resolver,
resolver_variant,
):
"""
Test --no-clean option blocks cleaning after wheel build
@ -209,7 +209,7 @@ def test_no_clean_option_blocks_cleaning_after_wheel(
allow_stderr_warning=True,
)
if not use_new_resolver:
if resolver_variant == "legacy":
build = build / 'simple'
message = "build/simple should still exist {}".format(result)
assert exists(build), message