Skip to content

Commit 1471023

Browse files
arurjasnell
authored andcommitted
test: move tick.js from test/async-hooks to test/common
PR-URL: #23551 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 39377bc commit 1471023

25 files changed

+29
-33
lines changed

test/async-hooks/test-crypto-pbkdf2.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if (!common.isMainThread)
77
common.skip('Worker bootstrapping works differently -> different async IDs');
88

99
const assert = require('assert');
10-
const tick = require('./tick');
10+
const tick = require('../common/tick');
1111
const initHooks = require('./init-hooks');
1212
const { checkInvocations } = require('./hook-checks');
1313
const crypto = require('crypto');

test/async-hooks/test-crypto-randomBytes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if (!common.isMainThread)
77
common.skip('Worker bootstrapping works differently -> different async IDs');
88

99
const assert = require('assert');
10-
const tick = require('./tick');
10+
const tick = require('../common/tick');
1111
const initHooks = require('./init-hooks');
1212
const { checkInvocations } = require('./hook-checks');
1313
const crypto = require('crypto');

test/async-hooks/test-embedder.api.async-resource.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const common = require('../common');
44
const assert = require('assert');
5-
const tick = require('./tick');
5+
const tick = require('../common/tick');
66
const async_hooks = require('async_hooks');
77
const { AsyncResource } = async_hooks;
88

test/async-hooks/test-enable-disable.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585

8686
const common = require('../common');
8787
const assert = require('assert');
88-
const tick = require('./tick');
88+
const tick = require('../common/tick');
8989
const initHooks = require('./init-hooks');
9090
const { checkInvocations } = require('./hook-checks');
9191

test/async-hooks/test-fseventwrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const common = require('../common');
33

44
const assert = require('assert');
55
const initHooks = require('./init-hooks');
6-
const tick = require('./tick');
6+
const tick = require('../common/tick');
77
const { checkInvocations } = require('./hook-checks');
88
const fs = require('fs');
99

test/async-hooks/test-fsreqcallback-access.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const common = require('../common');
44
const assert = require('assert');
5-
const tick = require('./tick');
5+
const tick = require('../common/tick');
66
const initHooks = require('./init-hooks');
77
const { checkInvocations } = require('./hook-checks');
88
const fs = require('fs');

test/async-hooks/test-fsreqcallback-readFile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const common = require('../common');
44
const assert = require('assert');
5-
const tick = require('./tick');
5+
const tick = require('../common/tick');
66
const initHooks = require('./init-hooks');
77
const { checkInvocations } = require('./hook-checks');
88
const fs = require('fs');

test/async-hooks/test-getaddrinforeqwrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const common = require('../common');
44
const assert = require('assert');
5-
const tick = require('./tick');
5+
const tick = require('../common/tick');
66
const initHooks = require('./init-hooks');
77
const { checkInvocations } = require('./hook-checks');
88
const dns = require('dns');

test/async-hooks/test-getnameinforeqwrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const common = require('../common');
44
const assert = require('assert');
5-
const tick = require('./tick');
5+
const tick = require('../common/tick');
66
const initHooks = require('./init-hooks');
77
const { checkInvocations } = require('./hook-checks');
88
const dns = require('dns');

test/async-hooks/test-httpparser.request.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
const common = require('../common');
55
const assert = require('assert');
6-
const tick = require('./tick');
6+
const tick = require('../common/tick');
77
const initHooks = require('./init-hooks');
88
const { checkInvocations } = require('./hook-checks');
99

test/async-hooks/test-httpparser.response.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
const common = require('../common');
55
const assert = require('assert');
6-
const tick = require('./tick');
6+
const tick = require('../common/tick');
77
const initHooks = require('./init-hooks');
88
const { checkInvocations } = require('./hook-checks');
99

test/async-hooks/test-immediate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const common = require('../common');
44
const assert = require('assert');
5-
const tick = require('./tick');
5+
const tick = require('../common/tick');
66
const initHooks = require('./init-hooks');
77
const { checkInvocations } = require('./hook-checks');
88

test/async-hooks/test-pipeconnectwrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const common = require('../common');
44
const assert = require('assert');
5-
const tick = require('./tick');
5+
const tick = require('../common/tick');
66
const initHooks = require('./init-hooks');
77
const { checkInvocations } = require('./hook-checks');
88

test/async-hooks/test-pipewrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const common = require('../common');
77
const assert = require('assert');
8-
const tick = require('./tick');
8+
const tick = require('../common/tick');
99
const initHooks = require('./init-hooks');
1010
const { checkInvocations } = require('./hook-checks');
1111
const spawn = require('child_process').spawn;

test/async-hooks/test-querywrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
const common = require('../common');
55
const assert = require('assert');
6-
const tick = require('./tick');
6+
const tick = require('../common/tick');
77
const initHooks = require('./init-hooks');
88
const { checkInvocations } = require('./hook-checks');
99
const dns = require('dns');

test/async-hooks/test-tcpwrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if (!common.hasIPv6)
66
common.skip('IPv6 support required');
77

88
const assert = require('assert');
9-
const tick = require('./tick');
9+
const tick = require('../common/tick');
1010
const initHooks = require('./init-hooks');
1111
const { checkInvocations } = require('./hook-checks');
1212
const net = require('net');

test/async-hooks/test-timers.setTimeout.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const common = require('../common');
44
const assert = require('assert');
5-
const tick = require('./tick');
5+
const tick = require('../common/tick');
66
const initHooks = require('./init-hooks');
77
const { checkInvocations } = require('./hook-checks');
88
const TIMEOUT = common.platformTimeout(100);

test/async-hooks/test-tlswrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const assert = require('assert');
88
const fixtures = require('../common/fixtures');
99
const tls = require('tls');
1010

11-
const tick = require('./tick');
11+
const tick = require('../common/tick');
1212
const initHooks = require('./init-hooks');
1313
const { checkInvocations } = require('./hook-checks');
1414

test/async-hooks/test-ttywrap.readstream.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const common = require('../common');
44
const assert = require('assert');
55

66
// general hook test setup
7-
const tick = require('./tick');
7+
const tick = require('../common/tick');
88
const initHooks = require('./init-hooks');
99
const { checkInvocations } = require('./hook-checks');
1010

test/async-hooks/test-ttywrap.writestream.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const common = require('../common');
44
const assert = require('assert');
55

66
// general hook test setup
7-
const tick = require('./tick');
7+
const tick = require('../common/tick');
88
const initHooks = require('./init-hooks');
99
const { checkInvocations } = require('./hook-checks');
1010

test/async-hooks/test-udpwrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const common = require('../common');
44
const assert = require('assert');
5-
const tick = require('./tick');
5+
const tick = require('../common/tick');
66
const initHooks = require('./init-hooks');
77
const { checkInvocations } = require('./hook-checks');
88
const dgram = require('dgram');

test/common/README.md

+6
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ This directory contains modules used to test the Node.js implementation.
1313
* [Heap dump checker module](#heap-dump-checker-module)
1414
* [HTTP2 module](#http2-module)
1515
* [Internet module](#internet-module)
16+
* [tick module](#tick-module)
1617
* [tmpdir module](#tmpdir-module)
1718
* [WPT module](#wpt-module)
1819

@@ -744,6 +745,11 @@ a full `setImmediate()` invocation passes.
744745
should not be in scope when `listener.ongc()` is created.
745746

746747

748+
## tick Module
749+
750+
The `tick` module provides a helper function that can be used to call a callback
751+
after a given number of event loop "ticks".
752+
747753
## tmpdir Module
748754

749755
The `tmpdir` module supports the use of a temporary directory for testing.
File renamed without changes.

test/parallel/test-http2-session-gc-while-write-scheduled.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ if (!common.hasCrypto)
66
common.skip('missing crypto');
77
const http2 = require('http2');
88
const makeDuplexPair = require('../common/duplexpair');
9+
const tick = require('../common/tick');
910

1011
// This tests that running garbage collection while an Http2Session has
1112
// a write *scheduled*, it will survive that garbage collection.
@@ -25,8 +26,3 @@ const makeDuplexPair = require('../common/duplexpair');
2526
global.gc();
2627
});
2728
}
28-
29-
function tick(n, cb) {
30-
if (n--) setImmediate(tick, n, cb);
31-
else cb();
32-
}

test/parallel/test-worker-message-port-transfer-self.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const common = require('../common');
55
const assert = require('assert');
66
const util = require('util');
77
const { MessageChannel } = require('worker_threads');
8+
const tick = require('../common/tick');
89

910
const { port1, port2 } = new MessageChannel();
1011

@@ -42,10 +43,3 @@ port2.onmessage = common.mustCall((message) => {
4243
});
4344
});
4445
port1.postMessage(2);
45-
46-
function tick(n, cb) {
47-
if (n > 0)
48-
setImmediate(() => tick(n - 1, cb));
49-
else
50-
cb();
51-
}

0 commit comments

Comments
 (0)