fix and debug

Author: fantix

tests/test_dns.py

@@ -1,38 +1,17 @@
 import asyncio
 import socket
+import sys
 import unittest
 
 from uvloop import _testbase as tb
 
 
-def patched_getaddrinfo(*args, **kwargs):
-    # corrected socket.getaddrinfo() behavior: ai_canonname always follows the
-    # 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 and first:
-                first = False
-                canon_name = args[0]
-                if not isinstance(canon_name, str):
-                    canon_name = canon_name.decode('ascii')
-        elif canon_name:
-            canon_name = ''
-        rv.append((af, sk, proto, canon_name, addr))
-    return rv
-
-
 class BaseTestDNS:
 
-    def _test_getaddrinfo(self, *args, _patch=False, _sorted=False, **kwargs):
+    def _test_getaddrinfo(self, *args, _sorted=False, **kwargs):
         err = None
         try:
-            if _patch:
-                a1 = patched_getaddrinfo(*args, **kwargs)
-            else:
-                a1 = socket.getaddrinfo(*args, **kwargs)
+            a1 = socket.getaddrinfo(*args, **kwargs)
         except (socket.gaierror, UnicodeError) as ex:
             err = ex
 
@@ -54,20 +33,23 @@ def _test_getaddrinfo(self, *args, _patch=False, _sorted=False, **kwargs):
 
             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(a1[0][3], a2[0][3])
+                    a1 = [(af, sk, pr, addr) for af, sk, pr, _, addr in a1]
+                    a2 = [(af, sk, pr, addr) for af, sk, pr, _, addr in a2]
 
                 try:
                     self.assertEqual(sorted(a1), sorted(a2))
                 except AssertionError:
                     for x, y in zip(sorted(a1), sorted(a2)):
-                        print(x, '\t', y)
+                        print(x, '\t', y, file=sys.stderr)
                     raise
             else:
-                self.assertEqual(a1, a2)
+                try:
+                    self.assertEqual(a1, a2)
+                except AssertionError:
+                    for x, y in zip(a1, a2):
+                        print(x, '\t', y, file=sys.stderr)
+                    raise
 
     def _test_getnameinfo(self, *args, **kwargs):
         err = None
@@ -146,32 +128,28 @@ def test_getaddrinfo_12(self):
         patch = self.implementation != 'asyncio'
 
         self._test_getaddrinfo('127.0.0.1', '80')
-        self._test_getaddrinfo('127.0.0.1', '80', type=socket.SOCK_STREAM,
-                               _patch=patch)
+        self._test_getaddrinfo('127.0.0.1', '80', type=socket.SOCK_STREAM)
 
     def test_getaddrinfo_13(self):
         # musl always returns ai_canonname but we don't
         patch = self.implementation != 'asyncio'
 
         self._test_getaddrinfo(b'127.0.0.1', b'80')
-        self._test_getaddrinfo(b'127.0.0.1', b'80', type=socket.SOCK_STREAM,
-                               _patch=patch)
+        self._test_getaddrinfo(b'127.0.0.1', b'80', type=socket.SOCK_STREAM)
 
     def test_getaddrinfo_14(self):
         # musl always returns ai_canonname but we don't
         patch = self.implementation != 'asyncio'
 
         self._test_getaddrinfo(b'127.0.0.1', b'http')
-        self._test_getaddrinfo(b'127.0.0.1', b'http', type=socket.SOCK_STREAM,
-                               _patch=patch)
+        self._test_getaddrinfo(b'127.0.0.1', b'http', type=socket.SOCK_STREAM)
 
     def test_getaddrinfo_15(self):
         # musl always returns ai_canonname but we don't
         patch = self.implementation != 'asyncio'
 
         self._test_getaddrinfo('127.0.0.1', 'http')
-        self._test_getaddrinfo('127.0.0.1', 'http', type=socket.SOCK_STREAM,
-                               _patch=patch)
+        self._test_getaddrinfo('127.0.0.1', 'http', type=socket.SOCK_STREAM)
 
     def test_getaddrinfo_16(self):
         self._test_getaddrinfo('localhost', 'http')
@@ -192,10 +170,9 @@ def test_getaddrinfo_19(self):
         patch = self.implementation != 'asyncio'
 
         self._test_getaddrinfo('::1', 80)
+        self._test_getaddrinfo('::1', 80, type=socket.SOCK_STREAM)
         self._test_getaddrinfo('::1', 80, type=socket.SOCK_STREAM,
-                               _patch=patch)
-        self._test_getaddrinfo('::1', 80, type=socket.SOCK_STREAM,
-                               flags=socket.AI_CANONNAME, _patch=patch)
+                               flags=socket.AI_CANONNAME)
 
     def test_getaddrinfo_20(self):
         # musl always returns ai_canonname while macOS never return for IPs,
@@ -204,10 +181,9 @@ def test_getaddrinfo_20(self):
         patch = self.implementation != 'asyncio'
 
         self._test_getaddrinfo('127.0.0.1', 80)
+        self._test_getaddrinfo('127.0.0.1', 80, type=socket.SOCK_STREAM)
         self._test_getaddrinfo('127.0.0.1', 80, type=socket.SOCK_STREAM,
-                               _patch=patch)
-        self._test_getaddrinfo('127.0.0.1', 80, type=socket.SOCK_STREAM,
-                               flags=socket.AI_CANONNAME, _patch=patch)
+                               flags=socket.AI_CANONNAME)
 
     # https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6
     # See also: https://github.com/MagicStack/uvloop/pull/600