From d6be0b3e2e59ac148eabc54319656da1883b1182 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Thu, 15 Sep 2022 11:20:57 -0400 Subject: [PATCH 1/2] TST: Skip connection dependent tests when no connection is present --- etelemetry/tests/test_client.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/etelemetry/tests/test_client.py b/etelemetry/tests/test_client.py index ad9af73..e58fa61 100644 --- a/etelemetry/tests/test_client.py +++ b/etelemetry/tests/test_client.py @@ -4,6 +4,20 @@ from ..client import _etrequest, get_project, check_available_version +def check_cxn(): + import requests + + try: + requests.get("https://google.com") + return True + except Exception: + return False + + +no_cxn = check_cxn() is False + + +@pytest.mark.skipif(no_cxn, reason="No connection") def test_etrequest(): endpoint = "http://fakeendpoint/" with pytest.raises(RuntimeError): @@ -16,6 +30,7 @@ def test_etrequest(): assert _etrequest(endpoint) +@pytest.mark.skipif(no_cxn, reason="No connection") def test_get_project(): repo = "invalidrepo" with pytest.raises(ValueError): @@ -27,8 +42,9 @@ def test_get_project(): def test_noet(): import os + old_var = None - if 'NO_ET' in os.environ: + if "NO_ET" in os.environ: old_var = (True, os.environ["NO_ET"]) os.environ["NO_ET"] = "1" repo = "github/hub" @@ -40,6 +56,7 @@ def test_noet(): os.environ["NO_ET"] = old_var[1] +@pytest.mark.skipif(no_cxn, reason="No connection") def test_check_available(): repo = "invalidrepo" res = check_available_version(repo, "0.1.0") From 760803ba1d5de2bdfcb1da0ab311f7788b700f72 Mon Sep 17 00:00:00 2001 From: Mathias Goncalves Date: Thu, 22 Jun 2023 10:11:16 -0400 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Yaroslav Halchenko --- etelemetry/tests/test_client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etelemetry/tests/test_client.py b/etelemetry/tests/test_client.py index e58fa61..1fb8dc8 100644 --- a/etelemetry/tests/test_client.py +++ b/etelemetry/tests/test_client.py @@ -4,11 +4,11 @@ from ..client import _etrequest, get_project, check_available_version -def check_cxn(): +def check_cxn(scope="session"): import requests try: - requests.get("https://google.com") + requests.get("http://example.com") return True except Exception: return False