tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix test on MacOS (2)

Browse Source
This commit is contained in:
Unrud 2020-02-20 10:55:00 +01:00
parent 363dd79833
commit ee984b49d4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
radicale/tests/test_server.py
View File

@ -117,9 +117,13 @@ class TestBaseServerRequests(BaseTest):
self.get("/", check=302) self.get("/", check=302)
def test_bind_fail(self): def test_bind_fail(self):
for 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(family, socket.SOCK_STREAM) as sock: with socket.socket(address_family, socket.SOCK_STREAM) as sock:
if address_family == socket.AF_INET6:
# Only allow IPv6 connections to the IPv6 socket
sock.setsockopt(server.COMPAT_IPPROTO_IPV6,
socket.IPV6_V6ONLY, 1)
with pytest.raises(OSError) as exc_info: with pytest.raises(OSError) as exc_info:
sock.bind((address, 0)) sock.bind((address, 0))
assert (isinstance(exc_info.value, socket.gaierror) and assert (isinstance(exc_info.value, socket.gaierror) and
@ -130,6 +134,8 @@ class TestBaseServerRequests(BaseTest):
def test_ipv6(self): def test_ipv6(self):
with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as sock: with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as sock:
# Only allow IPv6 connections to the IPv6 socket
sock.setsockopt(server.COMPAT_IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
try: try:
# Find available port # Find available port
sock.bind(("::1", 0)) sock.bind(("::1", 0))