GeezerVison is showing github.com — test: fix DNS cancel tests · nodejs/node@f47e8fc
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: test/parallel/test-dns-channel-cancel-promise.js +8-14Lines changed: 8 additions & 14 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -7,23 +7,15 @@ const dgram = require('dgram'); |
7 | 7 | const server = dgram.createSocket('udp4'); |
8 | 8 | const resolver = new dnsPromises.Resolver(); |
9 | 9 |
|
10 | | -const addMessageListener = () => { |
11 | | - server.removeAllListeners('message'); |
12 | | - |
13 | | - server.once('message', () => { |
14 | | - server.once('message', common.mustNotCall); |
15 | | - |
16 | | - resolver.cancel(); |
17 | | - }); |
18 | | -}; |
19 | | - |
20 | 10 | server.bind(0, common.mustCall(async () => { |
21 | 11 | resolver.setServers([`127.0.0.1:${server.address().port}`]); |
22 | 12 |
|
23 | | - addMessageListener(); |
24 | | - |
25 | 13 | // Single promise |
26 | 14 | { |
| 15 | + server.once('message', () => { |
| 16 | + resolver.cancel(); |
| 17 | + }); |
| 18 | + |
27 | 19 | const hostname = 'example0.org'; |
28 | 20 |
|
29 | 21 | await assert.rejects( |
@@ -36,10 +28,12 @@ server.bind(0, common.mustCall(async () => { |
36 | 28 | ); |
37 | 29 | } |
38 | 30 |
|
39 | | - addMessageListener(); |
40 | | - |
41 | 31 | // Multiple promises |
42 | 32 | { |
| 33 | + server.once('message', () => { |
| 34 | + resolver.cancel(); |
| 35 | + }); |
| 36 | + |
43 | 37 | const assertions = []; |
44 | 38 | const assertionCount = 10; |
45 | 39 |
|
|
Collapse file
Copy file name to clipboardExpand all lines: test/parallel/test-dns-channel-cancel.js +7-12Lines changed: 7 additions & 12 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -10,16 +10,6 @@ const resolver = new Resolver(); |
10 | 10 | const desiredQueries = 11; |
11 | 11 | let finishedQueries = 0; |
12 | 12 |
|
13 | | -const addMessageListener = () => { |
14 | | - server.removeAllListeners('message'); |
15 | | - |
16 | | - server.once('message', () => { |
17 | | - server.once('message', common.mustNotCall); |
18 | | - |
19 | | - resolver.cancel(); |
20 | | - }); |
21 | | -}; |
22 | | - |
23 | 13 | server.bind(0, common.mustCall(async () => { |
24 | 14 | resolver.setServers([`127.0.0.1:${server.address().port}`]); |
25 | 15 |
|
@@ -37,15 +27,20 @@ server.bind(0, common.mustCall(async () => { |
37 | 27 | const next = (...args) => { |
38 | 28 | callback(...args); |
39 | 29 |
|
40 | | - addMessageListener(); |
| 30 | + server.once('message', () => { |
| 31 | + resolver.cancel(); |
| 32 | + }); |
41 | 33 |
|
42 | 34 | // Multiple queries |
43 | 35 | for (let i = 1; i < desiredQueries; i++) { |
44 | 36 | resolver.resolve4(`example${i}.org`, callback); |
45 | 37 | } |
46 | 38 | }; |
47 | 39 |
|
| 40 | + server.once('message', () => { |
| 41 | + resolver.cancel(); |
| 42 | + }); |
| 43 | + |
48 | 44 | // Single query |
49 | | - addMessageListener(); |
50 | 45 | resolver.resolve4('example0.org', next); |
51 | 46 | })); |