oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-07-02 16:58:30 +00:00
Code Wiki Activity

Merge pull request #1328 from tjni/python3.11-brackets

Browse source 
Remove brackets from IPv4 test hostnames
This commit is contained in:
Peter Bieringer 2024-03-01 07:28:46 +01:00 • committed by GitHub
commit e6d4611980
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
radicale/tests/test_server.py
View file

@ -60,8 +60,9 @@ class TestBaseServerRequests(BaseTest):
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock: with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
# Find available port # Find available port
sock.bind(("127.0.0.1", 0)) sock.bind(("127.0.0.1", 0))
self.sockfamily = socket.AF_INET
self.sockname = sock.getsockname() self.sockname = sock.getsockname()
self.configure({"server": {"hosts": "[%s]:%d" % self.sockname}, self.configure({"server": {"hosts": "%s:%d" % self.sockname},
# Enable debugging for new processes # Enable debugging for new processes
"logging": {"level": "debug"}}) "logging": {"level": "debug"}})
self.thread = threading.Thread(target=server.serve, args=( self.thread = threading.Thread(target=server.serve, args=(
@ -105,8 +106,9 @@ class TestBaseServerRequests(BaseTest):
data_bytes = None data_bytes = None
if data: if data:
data_bytes = data.encode(encoding) data_bytes = data.encode(encoding)
req_host = ("[%s]" % self.sockname[0]) if self.sockfamily == socket.AF_INET6 else self.sockname[0]
req = request.Request( req = request.Request(
"%s://[%s]:%d%s" % (scheme, *self.sockname, path), "%s://%s:%d%s" % (scheme, req_host, self.sockname[1], path),
data=data_bytes, headers=headers, method=method) data=data_bytes, headers=headers, method=method)
while True: while True:
assert is_alive_fn() assert is_alive_fn()
@ -161,6 +163,7 @@ class TestBaseServerRequests(BaseTest):
server.COMPAT_IPPROTO_IPV6, socket.IPV6_V6ONLY, 1) server.COMPAT_IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
# Find available port # Find available port
sock.bind(("::1", 0)) sock.bind(("::1", 0))
self.sockfamily = socket.AF_INET6
self.sockname = sock.getsockname()[:2] self.sockname = sock.getsockname()[:2]
except OSError as e: except OSError as e:
if e.errno in (errno.EADDRNOTAVAIL, errno.EAFNOSUPPORT, if e.errno in (errno.EADDRNOTAVAIL, errno.EAFNOSUPPORT,