mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-net-tests-on-ipv6' into 'master'

Browse source 
fix localhost network tests on systems with IPv6

See merge request fdroid/fdroidserver!1581
This commit is contained in:
Hans-Christoph Steiner 2024-12-12 15:20:24 +00:00
commit dfbf79ef2b
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/test_net.py
View file

@ -37,9 +37,13 @@ class RetryServer:
self.stop_event.set() self.stop_event.set()
def run_fake_server(self): def run_fake_server(self):
server_sock = socket.socket() addr = ('localhost', self.port)
server_sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) if socket.has_dualstack_ipv6():
server_sock.bind(('localhost', self.port)) server_sock = socket.create_server(
addr, family=socket.AF_INET6, dualstack_ipv6=True
)
else:
server_sock = socket.create_server(addr)
server_sock.listen(5) server_sock.listen(5)
server_sock.settimeout(5) server_sock.settimeout(5)
time.sleep(0.001) # wait for it to start time.sleep(0.001) # wait for it to start