From 4e3a77d9d542a7b8be99573869bed9ca1f1f17c3 Mon Sep 17 00:00:00 2001 From: Mathieu Dupuy Date: Fri, 20 Oct 2023 10:23:41 +0200 Subject: [PATCH] Revert "even more cleaning" This reverts commit 578d3db7102b3aca4b50def06b40e33adf36b829. --- tests/integration/conftest.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index d3857561..3a4c88f2 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -94,11 +94,22 @@ WE_HAVE_HG = check_for_mercurial() def pytest_runtest_setup(item): if item.get_closest_marker('needs_internet') is not None and not WE_HAVE_INTERNET: pytest.skip('requires internet') + if item.get_closest_marker('needs_github_ssh') is not None and not WE_HAVE_GITHUB_SSH_KEYS: + pytest.skip('requires github ssh') + if item.get_closest_marker('needs_hg') is not None and not WE_HAVE_HG: + pytest.skip('requires mercurial') + if item.get_closest_marker('skip_py38') is not None and ( + sys.version_info[:2] == (3, 8) + ): + pytest.skip('test not applicable on python 3.8') + if item.get_closest_marker('skip_osx') is not None and sys.platform == 'darwin': + pytest.skip('test does not apply on OSX') if item.get_closest_marker('skip_windows') is not None and (os.name == 'nt'): pytest.skip('test does not run on windows') WE_HAVE_INTERNET = check_internet() +WE_HAVE_GITHUB_SSH_KEYS = False class _Pipfile: