thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-02-24 01:38:15 +00:00
Code Issues Releases Wiki Activity

tests: remove custom system_has_ipv6() method

Browse Source
This commit is contained in:
Nicolas Duchon 2024-12-26 01:13:29 +01:00
parent fb0fc331c0
commit 7b6baa43cd
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/conftest.py
View File

@ -15,7 +15,7 @@ import pytest
import requests import requests
from packaging.version import Version from packaging.version import Version
from docker.models.containers import Container from docker.models.containers import Container
from urllib3.util.connection import HAS_IPV6
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
logging.getLogger('backoff').setLevel(logging.INFO) logging.getLogger('backoff').setLevel(logging.INFO)
@ -40,23 +40,6 @@ test_container = 'nginx-proxy-pytest'
# #
############################################################################### ###############################################################################
def system_has_ipv6() -> bool:
# See https://stackoverflow.com/a/66249915
_ADDR_NOT_AVAIL = {errno.EADDRNOTAVAIL, errno.EAFNOSUPPORT}
_ADDR_IN_USE = {errno.EADDRINUSE}
if not socket.has_ipv6:
return False
try:
with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as sock:
sock.bind(("::1", 0))
return True
except OSError as e:
if e.errno in _ADDR_NOT_AVAIL:
return False
if e.errno in _ADDR_IN_USE:
return True
raise
@contextlib.contextmanager @contextlib.contextmanager
def ipv6(force_ipv6=True): def ipv6(force_ipv6=True):
@ -168,7 +151,7 @@ def container_ip(container: Container):
""" """
global FORCE_CONTAINER_IPV6 global FORCE_CONTAINER_IPV6
if FORCE_CONTAINER_IPV6: if FORCE_CONTAINER_IPV6:
if not system_has_ipv6(): if not HAS_IPV6:
pytest.skip("This system does not support IPv6") pytest.skip("This system does not support IPv6")
ip = container_ipv6(container) ip = container_ipv6(container)
if ip == '': if ip == '':
@ -272,7 +255,7 @@ def monkey_patch_urllib_dns_resolver():
# Fail early when querying IP directly, and it is forced ipv6 when not supported, # Fail early when querying IP directly, and it is forced ipv6 when not supported,
# Otherwise a pytest container not using the host network fails to pass `test_raw-ip-vhost`. # Otherwise a pytest container not using the host network fails to pass `test_raw-ip-vhost`.
if FORCE_CONTAINER_IPV6 and not system_has_ipv6(): if FORCE_CONTAINER_IPV6 and not HAS_IPV6:
pytest.skip("This system does not support IPv6") pytest.skip("This system does not support IPv6")
# custom DNS resolvers # custom DNS resolvers

1
test/requirements/python-requirements.txt
View File

@ -3,3 +3,4 @@ docker==7.1.0
packaging==24.2 packaging==24.2
pytest==8.3.4 pytest==8.3.4
requests==2.32.3 requests==2.32.3
urllib3==2.3.0