|
1 | 1 | import asyncio |
2 | 2 | import socket |
| 3 | +import sys |
3 | 4 | import unittest |
4 | 5 |
|
5 | 6 | from uvloop import _testbase as tb |
@@ -54,20 +55,23 @@ def _test_getaddrinfo(self, *args, _patch=False, _sorted=False, **kwargs): |
54 | 55 |
|
55 | 56 | if _sorted: |
56 | 57 | if kwargs.get('flags', 0) & socket.AI_CANONNAME and a1 and a2: |
57 | | - af, sk, proto, canon_name1, addr = a1[0] |
58 | | - a1[0] = (af, sk, proto, '', addr) |
59 | | - af, sk, proto, canon_name2, addr = a2[0] |
60 | | - a2[0] = (af, sk, proto, '', addr) |
61 | | - self.assertEqual(canon_name1, canon_name2) |
| 58 | + self.assertEqual(a1[0][3], a2[0][3]) |
| 59 | + a1 = [(af, sk, pr, addr) for af, sk, pr, _, addr in a1] |
| 60 | + a2 = [(af, sk, pr, addr) for af, sk, pr, _, addr in a2] |
62 | 61 |
|
63 | 62 | try: |
64 | 63 | self.assertEqual(sorted(a1), sorted(a2)) |
65 | 64 | except AssertionError: |
66 | 65 | for x, y in zip(sorted(a1), sorted(a2)): |
67 | | - print(x, '\t', y) |
| 66 | + print(x, '\t', y, file=sys.stderr) |
68 | 67 | raise |
69 | 68 | else: |
70 | | - self.assertEqual(a1, a2) |
| 69 | + try: |
| 70 | + self.assertEqual(a1, a2) |
| 71 | + except AssertionError: |
| 72 | + for x, y in zip(a1, a2): |
| 73 | + print(x, '\t', y, file=sys.stderr) |
| 74 | + raise |
71 | 75 |
|
72 | 76 | def _test_getnameinfo(self, *args, **kwargs): |
73 | 77 | err = None |
|
0 commit comments