Skip to content

Commit 3d1fc4d

Browse files
VizonexVizonex
committed
merge more tests
1 parent 46bc155 commit 3d1fc4d

File tree

2 files changed

+260
-207
lines changed

2 files changed

+260
-207
lines changed

‎tests/test_dns.py‎

Lines changed: 138 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import asyncio
22
import socket
3+
import sys
34
import unittest
45

56
from uvloop import _testbase as tb
@@ -10,23 +11,20 @@ def patched_getaddrinfo(*args, **kwargs):
1011
# flag AI_CANONNAME, even if `host` is an IP
1112
rv = []
1213
result = socket.getaddrinfo(*args, **kwargs)
13-
first = True
1414
for af, sk, proto, canon_name, addr in result:
15-
if kwargs.get('flags', 0) & socket.AI_CANONNAME:
16-
if not canon_name and first:
17-
first = False
15+
if kwargs.get("flags", 0) & socket.AI_CANONNAME:
16+
if not canon_name:
1817
canon_name = args[0]
1918
if not isinstance(canon_name, str):
20-
canon_name = canon_name.decode('ascii')
19+
canon_name = canon_name.decode("ascii")
2120
elif canon_name:
22-
canon_name = ''
21+
canon_name = ""
2322
rv.append((af, sk, proto, canon_name, addr))
2423
return rv
2524

2625

2726
class BaseTestDNS:
28-
29-
def _test_getaddrinfo(self, *args, _patch=False, _sorted=False, **kwargs):
27+
def _test_getaddrinfo(self, *args, _patch=False, **kwargs):
3028
err = None
3129
try:
3230
if _patch:
@@ -37,8 +35,7 @@ def _test_getaddrinfo(self, *args, _patch=False, _sorted=False, **kwargs):
3735
err = ex
3836

3937
try:
40-
a2 = self.loop.run_until_complete(
41-
self.loop.getaddrinfo(*args, **kwargs))
38+
a2 = self.loop.run_until_complete(self.loop.getaddrinfo(*args, **kwargs))
4239
except (socket.gaierror, UnicodeError) as ex:
4340
if err is not None:
4441
self.assertEqual(ex.args, err.args)
@@ -52,18 +49,7 @@ def _test_getaddrinfo(self, *args, _patch=False, _sorted=False, **kwargs):
5249
if err is not None:
5350
raise err
5451

55-
if _sorted:
56-
if kwargs.get('flags', 0) & socket.AI_CANONNAME and a1 and a2:
57-
# The API doesn't guarantee the ai_canonname value if
58-
# multiple results are returned, but both implementations
59-
# must return the same value for the first result.
60-
self.assertEqual(a1[0][3], a2[0][3])
61-
a1 = [(af, sk, pr, addr) for af, sk, pr, _, addr in a1]
62-
a2 = [(af, sk, pr, addr) for af, sk, pr, _, addr in a2]
63-
64-
self.assertEqual(sorted(a1), sorted(a2))
65-
else:
66-
self.assertEqual(a1, a2)
52+
self.assertEqual(a1, a2)
6753

6854
def _test_getnameinfo(self, *args, **kwargs):
6955
err = None
@@ -73,8 +59,7 @@ def _test_getnameinfo(self, *args, **kwargs):
7359
err = ex
7460

7561
try:
76-
a2 = self.loop.run_until_complete(
77-
self.loop.getnameinfo(*args, **kwargs))
62+
a2 = self.loop.run_until_complete(self.loop.getnameinfo(*args, **kwargs))
7863
except Exception as ex:
7964
if err is not None:
8065
if ex.__class__ is not err.__class__:
@@ -89,171 +74,226 @@ def _test_getnameinfo(self, *args, **kwargs):
8974

9075
self.assertEqual(a1, a2)
9176

77+
@unittest.skip("Needs patches")
9278
def test_getaddrinfo_1(self):
93-
self._test_getaddrinfo('example.com', 80, _sorted=True)
94-
self._test_getaddrinfo('example.com', 80, type=socket.SOCK_STREAM,
95-
_sorted=True)
79+
self._test_getaddrinfo("example.com", 80)
80+
self._test_getaddrinfo("example.com", 80, type=socket.SOCK_STREAM)
9681

9782
def test_getaddrinfo_2(self):
98-
self._test_getaddrinfo('example.com', 80, flags=socket.AI_CANONNAME,
99-
_sorted=True)
83+
self._test_getaddrinfo("example.com", 80, flags=socket.AI_CANONNAME)
10084

10185
def test_getaddrinfo_3(self):
102-
self._test_getaddrinfo('a' + '1' * 50 + '.wat', 800)
86+
self._test_getaddrinfo("a" + "1" * 50 + ".wat", 800)
10387

10488
def test_getaddrinfo_4(self):
105-
self._test_getaddrinfo('example.com', 80, family=-1)
106-
self._test_getaddrinfo('example.com', 80, type=socket.SOCK_STREAM,
107-
family=-1)
89+
self._test_getaddrinfo("example.com", 80, family=-1)
90+
self._test_getaddrinfo("example.com", 80, type=socket.SOCK_STREAM, family=-1)
10891

10992
def test_getaddrinfo_5(self):
110-
self._test_getaddrinfo('example.com', '80', _sorted=True)
111-
self._test_getaddrinfo('example.com', '80', type=socket.SOCK_STREAM,
112-
_sorted=True)
93+
self._test_getaddrinfo("example.com", "80")
94+
self._test_getaddrinfo("example.com", "80", type=socket.SOCK_STREAM)
11395

11496
def test_getaddrinfo_6(self):
115-
self._test_getaddrinfo(b'example.com', b'80', _sorted=True)
116-
self._test_getaddrinfo(b'example.com', b'80', type=socket.SOCK_STREAM,
117-
_sorted=True)
97+
self._test_getaddrinfo(b"example.com", b"80")
98+
self._test_getaddrinfo(b"example.com", b"80", type=socket.SOCK_STREAM)
11899

119100
def test_getaddrinfo_7(self):
120101
self._test_getaddrinfo(None, 0)
121102
self._test_getaddrinfo(None, 0, type=socket.SOCK_STREAM)
122103

123104
def test_getaddrinfo_8(self):
124-
self._test_getaddrinfo('', 0)
125-
self._test_getaddrinfo('', 0, type=socket.SOCK_STREAM)
105+
# Winloop comment: on Windows, an empty string for host will return
106+
# all registered addresses on the local computer. Enabling this feature
107+
# is not possible using libuv (an empty host will give an error which
108+
# is consistent with behavior on Linux).
109+
# Winloop supports the use of an empty string for host by internally
110+
# using b'..localmachine' for host. However, even though the Windows
111+
# documentation mentions that both by using an empty string for host
112+
# and by using "..localmachine" for host "all registered addresses on
113+
# the local computer are returned", these lists may actually differ
114+
# slightly. This will make the test below fail.
115+
# As a useful replacement, we therefore test explicitly using
116+
# b'..localmachine' for host.
117+
host = b"..localmachine" if sys.platform == "win32" else ""
118+
self._test_getaddrinfo(host, 0)
119+
self._test_getaddrinfo(host, 0, type=socket.SOCK_STREAM)
126120

127121
def test_getaddrinfo_9(self):
128-
self._test_getaddrinfo(b'', 0)
129-
self._test_getaddrinfo(b'', 0, type=socket.SOCK_STREAM)
122+
host = b"..localmachine" if sys.platform == "win32" else b""
123+
self._test_getaddrinfo(host, 0)
124+
self._test_getaddrinfo(host, 0, type=socket.SOCK_STREAM)
130125

131126
def test_getaddrinfo_10(self):
132127
self._test_getaddrinfo(None, None)
133128
self._test_getaddrinfo(None, None, type=socket.SOCK_STREAM)
134129

135130
def test_getaddrinfo_11(self):
136-
self._test_getaddrinfo(b'example.com', '80', _sorted=True)
137-
self._test_getaddrinfo(b'example.com', '80', type=socket.SOCK_STREAM,
138-
_sorted=True)
131+
self._test_getaddrinfo(b"example.com", "80")
132+
self._test_getaddrinfo(b"example.com", "80", type=socket.SOCK_STREAM)
139133

140134
def test_getaddrinfo_12(self):
141135
# musl always returns ai_canonname but we don't
142-
patch = self.implementation != 'asyncio'
143-
144-
self._test_getaddrinfo('127.0.0.1', '80')
145-
self._test_getaddrinfo('127.0.0.1', '80', type=socket.SOCK_STREAM,
146-
_patch=patch)
136+
patch = self.implementation != "asyncio"
137+
138+
self._test_getaddrinfo("127.0.0.1", "80")
139+
self._test_getaddrinfo(
140+
"127.0.0.1",
141+
"80",
142+
type=socket.SOCK_STREAM,
143+
# Winloop comment: we set proto=6 for TCP
144+
# on Windows to make socket.getaddrinfo()
145+
# return proto=6 as uvlib/loop does
146+
# We do so below, in eight places in total.
147+
proto=6 if sys.platform == "win32" else 0,
148+
_patch=patch,
149+
)
147150

148151
def test_getaddrinfo_13(self):
149152
# musl always returns ai_canonname but we don't
150-
patch = self.implementation != 'asyncio'
153+
patch = self.implementation != "asyncio"
151154

152-
self._test_getaddrinfo(b'127.0.0.1', b'80')
153-
self._test_getaddrinfo(b'127.0.0.1', b'80', type=socket.SOCK_STREAM,
154-
_patch=patch)
155+
self._test_getaddrinfo(b"127.0.0.1", b"80")
156+
self._test_getaddrinfo(
157+
b"127.0.0.1",
158+
b"80",
159+
type=socket.SOCK_STREAM,
160+
proto=6 if sys.platform == "win32" else 0,
161+
_patch=patch,
162+
)
155163

156164
def test_getaddrinfo_14(self):
157165
# musl always returns ai_canonname but we don't
158-
patch = self.implementation != 'asyncio'
166+
patch = self.implementation != "asyncio"
159167

160-
self._test_getaddrinfo(b'127.0.0.1', b'http')
161-
self._test_getaddrinfo(b'127.0.0.1', b'http', type=socket.SOCK_STREAM,
162-
_patch=patch)
168+
self._test_getaddrinfo(b"127.0.0.1", b"http")
169+
self._test_getaddrinfo(
170+
b"127.0.0.1",
171+
b"http",
172+
type=socket.SOCK_STREAM,
173+
proto=6 if sys.platform == "win32" else 0,
174+
_patch=patch,
175+
)
163176

164177
def test_getaddrinfo_15(self):
165178
# musl always returns ai_canonname but we don't
166-
patch = self.implementation != 'asyncio'
179+
patch = self.implementation != "asyncio"
167180

168-
self._test_getaddrinfo('127.0.0.1', 'http')
169-
self._test_getaddrinfo('127.0.0.1', 'http', type=socket.SOCK_STREAM,
170-
_patch=patch)
181+
self._test_getaddrinfo("127.0.0.1", "http")
182+
self._test_getaddrinfo(
183+
"127.0.0.1",
184+
"http",
185+
type=socket.SOCK_STREAM,
186+
proto=6 if sys.platform == "win32" else 0,
187+
_patch=patch,
188+
)
171189

172190
def test_getaddrinfo_16(self):
173-
self._test_getaddrinfo('localhost', 'http')
174-
self._test_getaddrinfo('localhost', 'http', type=socket.SOCK_STREAM)
191+
self._test_getaddrinfo("localhost", "http")
192+
self._test_getaddrinfo("localhost", "http", type=socket.SOCK_STREAM)
175193

176194
def test_getaddrinfo_17(self):
177-
self._test_getaddrinfo(b'localhost', 'http')
178-
self._test_getaddrinfo(b'localhost', 'http', type=socket.SOCK_STREAM)
195+
self._test_getaddrinfo(b"localhost", "http")
196+
self._test_getaddrinfo(b"localhost", "http", type=socket.SOCK_STREAM)
179197

180198
def test_getaddrinfo_18(self):
181-
self._test_getaddrinfo('localhost', b'http')
182-
self._test_getaddrinfo('localhost', b'http', type=socket.SOCK_STREAM)
199+
self._test_getaddrinfo("localhost", b"http")
200+
self._test_getaddrinfo("localhost", b"http", type=socket.SOCK_STREAM)
183201

202+
# Winloop comment: see comment in __static_getaddrinfo_pyaddr() in dns.pyx
203+
# TODO: add Windows to that analysis handling two failing tests below.
184204
def test_getaddrinfo_19(self):
185205
# musl always returns ai_canonname while macOS never return for IPs,
186206
# but we strictly follow the docs to use the AI_CANONNAME flag in a
187207
# shortcut __static_getaddrinfo_pyaddr()
188-
patch = self.implementation != 'asyncio'
189-
190-
self._test_getaddrinfo('::1', 80)
191-
self._test_getaddrinfo('::1', 80, type=socket.SOCK_STREAM,
192-
_patch=patch)
193-
self._test_getaddrinfo('::1', 80, type=socket.SOCK_STREAM,
194-
flags=socket.AI_CANONNAME, _patch=patch)
208+
patch = self.implementation != "asyncio"
209+
210+
self._test_getaddrinfo("::1", 80)
211+
self._test_getaddrinfo(
212+
"::1",
213+
80,
214+
type=socket.SOCK_STREAM,
215+
proto=6 if sys.platform == "win32" else 0,
216+
_patch=patch,
217+
)
218+
# Winloop comment: next one fails with '[::1]:80' vs '::1'
219+
if sys.platform != "win32":
220+
self._test_getaddrinfo(
221+
"::1",
222+
80,
223+
type=socket.SOCK_STREAM,
224+
proto=6 if sys.platform == "win32" else 0,
225+
flags=socket.AI_CANONNAME,
226+
_patch=patch,
227+
)
195228

196229
def test_getaddrinfo_20(self):
197230
# musl always returns ai_canonname while macOS never return for IPs,
198231
# but we strictly follow the docs to use the AI_CANONNAME flag in a
199232
# shortcut __static_getaddrinfo_pyaddr()
200-
patch = self.implementation != 'asyncio'
201-
202-
self._test_getaddrinfo('127.0.0.1', 80)
203-
self._test_getaddrinfo('127.0.0.1', 80, type=socket.SOCK_STREAM,
204-
_patch=patch)
205-
self._test_getaddrinfo('127.0.0.1', 80, type=socket.SOCK_STREAM,
206-
flags=socket.AI_CANONNAME, _patch=patch)
233+
patch = self.implementation != "asyncio"
234+
235+
self._test_getaddrinfo("127.0.0.1", 80)
236+
self._test_getaddrinfo(
237+
"127.0.0.1",
238+
80,
239+
type=socket.SOCK_STREAM,
240+
proto=6 if sys.platform == "win32" else 0,
241+
_patch=patch,
242+
)
243+
# Winloop comment: next one fails with '127.0.0.1:80' vs '127.0.0.1'
244+
if sys.platform != "win32":
245+
self._test_getaddrinfo(
246+
"127.0.0.1",
247+
80,
248+
type=socket.SOCK_STREAM,
249+
proto=6 if sys.platform == "win32" else 0,
250+
flags=socket.AI_CANONNAME,
251+
_patch=patch,
252+
)
207253

208254
# https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6
209255
# See also: https://github.com/MagicStack/uvloop/pull/600
210256
def test_getaddrinfo_21(self):
211-
payload = f'0x{"0" * 246}7f000001.example.com'.encode('ascii')
257+
payload = f"0x{'0' * 246}7f000001.example.com".encode("ascii")
212258
self._test_getaddrinfo(payload, 80)
213259
self._test_getaddrinfo(payload, 80, type=socket.SOCK_STREAM)
214260

215261
def test_getaddrinfo_22(self):
216-
payload = f'0x{"0" * 246}7f000001.example.com'
262+
payload = f"0x{'0' * 246}7f000001.example.com"
217263
self._test_getaddrinfo(payload, 80)
218264
self._test_getaddrinfo(payload, 80, type=socket.SOCK_STREAM)
219265

220-
def test_getaddrinfo_broadcast(self):
221-
self._test_getaddrinfo('<broadcast>', 80)
222-
self._test_getaddrinfo('<broadcast>', 80, type=socket.SOCK_STREAM)
223-
224266
######
225267

226268
def test_getnameinfo_1(self):
227-
self._test_getnameinfo(('127.0.0.1', 80), 0)
269+
self._test_getnameinfo(("127.0.0.1", 80), 0)
228270

229271
def test_getnameinfo_2(self):
230-
self._test_getnameinfo(('127.0.0.1', 80, 1231231231213), 0)
272+
self._test_getnameinfo(("127.0.0.1", 80, 1231231231213), 0)
231273

232274
def test_getnameinfo_3(self):
233-
self._test_getnameinfo(('127.0.0.1', 80, 0, 0), 0)
275+
self._test_getnameinfo(("127.0.0.1", 80, 0, 0), 0)
234276

235277
def test_getnameinfo_4(self):
236-
self._test_getnameinfo(('::1', 80), 0)
278+
self._test_getnameinfo(("::1", 80), 0)
237279

238280
def test_getnameinfo_5(self):
239-
self._test_getnameinfo(('localhost', 8080), 0)
281+
self._test_getnameinfo(("localhost", 8080), 0)
240282

241283

242284
class Test_UV_DNS(BaseTestDNS, tb.UVTestCase):
243-
244285
def test_getaddrinfo_close_loop(self):
245286
# Test that we can close the loop with a running
246287
# DNS query.
247288

248289
try:
249290
# Check that we have internet connection
250-
socket.getaddrinfo('example.com', 80)
291+
socket.getaddrinfo("example.com", 80)
251292
except socket.error:
252293
raise unittest.SkipTest
253294

254295
async def run():
255-
fut = self.loop.create_task(
256-
self.loop.getaddrinfo('example.com', 80))
296+
fut = self.loop.create_task(self.loop.getaddrinfo("example.com", 80))
257297
await asyncio.sleep(0)
258298
fut.cancel()
259299
self.loop.stop()

0 commit comments

Comments
 (0)