Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix test failing on systems without IPv6 support

Browse Source
This commit is contained in:
Jack Wilsdon
2025-01-02 12:18:53 +00:00
parent ac8abbd12c
commit 532fad9ba6
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
radicale/tests/test_server.py
View File

@@ -141,13 +141,19 @@ class TestBaseServerRequests(BaseTest):
def test_bind_fail(self) -> None: def test_bind_fail(self) -> None:
for address_family, address in [(socket.AF_INET, "::1"), for address_family, address in [(socket.AF_INET, "::1"),
(socket.AF_INET6, "127.0.0.1")]: (socket.AF_INET6, "127.0.0.1")]:
with socket.socket(address_family, socket.SOCK_STREAM) as sock: try:
if address_family == socket.AF_INET6: with socket.socket(address_family, socket.SOCK_STREAM) as sock:
# Only allow IPv6 connections to the IPv6 socket if address_family == socket.AF_INET6:
sock.setsockopt(server.COMPAT_IPPROTO_IPV6, # Only allow IPv6 connections to the IPv6 socket
socket.IPV6_V6ONLY, 1) sock.setsockopt(server.COMPAT_IPPROTO_IPV6,
with pytest.raises(OSError) as exc_info: socket.IPV6_V6ONLY, 1)
sock.bind((address, 0)) with pytest.raises(OSError) as exc_info:
sock.bind((address, 0))
except OSError as e:
if e.errno in (errno.EADDRNOTAVAIL, errno.EAFNOSUPPORT,
errno.EPROTONOSUPPORT):
continue
raise
# See ``radicale.server.serve`` # See ``radicale.server.serve``
assert (isinstance(exc_info.value, socket.gaierror) and assert (isinstance(exc_info.value, socket.gaierror) and
exc_info.value.errno in ( exc_info.value.errno in (