From 07ec3013f0c746f610291dd86fa607a8752fa74a Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Fri, 30 Oct 2020 06:02:41 +0530 Subject: [PATCH] Drop custom logic for new_resolver tests --- setup.cfg | 1 - tests/conftest.py | 6 ------ 2 files changed, 7 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5f4fd4036..8d9edbcc0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -61,7 +61,6 @@ markers = mercurial: VCS: Mercurial git: VCS: git yaml: yaml based tests - fails_on_new_resolver: Does not yet work on the new resolver [coverage:run] branch = True diff --git a/tests/conftest.py b/tests/conftest.py index 629227ed8..53eb90391 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -68,12 +68,6 @@ def pytest_collection_modifyitems(config, items): if item.get_closest_marker('network') is not None: 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 (item.get_closest_marker('incompatible_with_test_venv') and config.getoption("--use-venv")):