Skip to content

test: fix getaddrinfo test #663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2025
Merged

test: fix getaddrinfo test #663

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 29 additions & 12 deletions tests/test_dns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ def patched_getaddrinfo(*args, **kwargs):
# flag AI_CANONNAME, even if `host` is an IP
rv = []
result = socket.getaddrinfo(*args, **kwargs)
first = True
for af, sk, proto, canon_name, addr in result:
if kwargs.get('flags', 0) & socket.AI_CANONNAME:
if not canon_name:
if not canon_name and first:
first = False
canon_name = args[0]
if not isinstance(canon_name, str):
canon_name = canon_name.decode('ascii')
Expand All @@ -24,7 +26,7 @@ def patched_getaddrinfo(*args, **kwargs):

class BaseTestDNS:

def _test_getaddrinfo(self, *args, _patch=False, **kwargs):
def _test_getaddrinfo(self, *args, _patch=False, _sorted=False, **kwargs):
err = None
try:
if _patch:
Expand All @@ -50,7 +52,17 @@ def _test_getaddrinfo(self, *args, _patch=False, **kwargs):
if err is not None:
raise err

self.assertEqual(a1, a2)
if _sorted:
if kwargs.get('flags', 0) & socket.AI_CANONNAME and a1 and a2:
af, sk, proto, canon_name1, addr = a1[0]
a1[0] = (af, sk, proto, '', addr)
af, sk, proto, canon_name2, addr = a2[0]
a2[0] = (af, sk, proto, '', addr)
self.assertEqual(canon_name1, canon_name2)

self.assertEqual(sorted(a1), sorted(a2))
else:
self.assertEqual(a1, a2)

def _test_getnameinfo(self, *args, **kwargs):
err = None
Expand All @@ -77,11 +89,13 @@ def _test_getnameinfo(self, *args, **kwargs):
self.assertEqual(a1, a2)

def test_getaddrinfo_1(self):
self._test_getaddrinfo('example.com', 80)
self._test_getaddrinfo('example.com', 80, type=socket.SOCK_STREAM)
self._test_getaddrinfo('example.com', 80, _sorted=True)
self._test_getaddrinfo('example.com', 80, type=socket.SOCK_STREAM,
_sorted=True)

def test_getaddrinfo_2(self):
self._test_getaddrinfo('example.com', 80, flags=socket.AI_CANONNAME)
self._test_getaddrinfo('example.com', 80, flags=socket.AI_CANONNAME,
_sorted=True)

def test_getaddrinfo_3(self):
self._test_getaddrinfo('a' + '1' * 50 + '.wat', 800)
Expand All @@ -92,12 +106,14 @@ def test_getaddrinfo_4(self):
family=-1)

def test_getaddrinfo_5(self):
self._test_getaddrinfo('example.com', '80')
self._test_getaddrinfo('example.com', '80', type=socket.SOCK_STREAM)
self._test_getaddrinfo('example.com', '80', _sorted=True)
self._test_getaddrinfo('example.com', '80', type=socket.SOCK_STREAM,
_sorted=True)

def test_getaddrinfo_6(self):
self._test_getaddrinfo(b'example.com', b'80')
self._test_getaddrinfo(b'example.com', b'80', type=socket.SOCK_STREAM)
self._test_getaddrinfo(b'example.com', b'80', _sorted=True)
self._test_getaddrinfo(b'example.com', b'80', type=socket.SOCK_STREAM,
_sorted=True)

def test_getaddrinfo_7(self):
self._test_getaddrinfo(None, 0)
Expand All @@ -116,8 +132,9 @@ def test_getaddrinfo_10(self):
self._test_getaddrinfo(None, None, type=socket.SOCK_STREAM)

def test_getaddrinfo_11(self):
self._test_getaddrinfo(b'example.com', '80')
self._test_getaddrinfo(b'example.com', '80', type=socket.SOCK_STREAM)
self._test_getaddrinfo(b'example.com', '80', _sorted=True)
self._test_getaddrinfo(b'example.com', '80', type=socket.SOCK_STREAM,
_sorted=True)

def test_getaddrinfo_12(self):
# musl always returns ai_canonname but we don't
Expand Down
Loading