mirror of https://github.com/pypa/pip
Drop custom logic for new_resolver tests
This commit is contained in:
parent
2d91950cad
commit
07ec3013f0
|
@ -61,7 +61,6 @@ markers =
|
||||||
mercurial: VCS: Mercurial
|
mercurial: VCS: Mercurial
|
||||||
git: VCS: git
|
git: VCS: git
|
||||||
yaml: yaml based tests
|
yaml: yaml based tests
|
||||||
fails_on_new_resolver: Does not yet work on the new resolver
|
|
||||||
|
|
||||||
[coverage:run]
|
[coverage:run]
|
||||||
branch = True
|
branch = True
|
||||||
|
|
|
@ -68,12 +68,6 @@ def pytest_collection_modifyitems(config, items):
|
||||||
if item.get_closest_marker('network') is not None:
|
if item.get_closest_marker('network') is not None:
|
||||||
item.add_marker(pytest.mark.flaky(reruns=3, reruns_delay=2))
|
item.add_marker(pytest.mark.flaky(reruns=3, reruns_delay=2))
|
||||||
|
|
||||||
if (item.get_closest_marker('fails_on_new_resolver') and
|
|
||||||
config.getoption("--new-resolver") and
|
|
||||||
not config.getoption("--new-resolver-runtests")):
|
|
||||||
item.add_marker(pytest.mark.skip(
|
|
||||||
'This test does not work with the new resolver'))
|
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
if (item.get_closest_marker('incompatible_with_test_venv') and
|
if (item.get_closest_marker('incompatible_with_test_venv') and
|
||||||
config.getoption("--use-venv")):
|
config.getoption("--use-venv")):
|
||||||
|
|
Loading…
Reference in New Issue