summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/common/README.md5
-rw-r--r--test/common/index.js7
-rw-r--r--test/common/index.mjs2
-rw-r--r--test/parallel/test-timers-nested.js6
-rw-r--r--test/parallel/test-timers-next-tick.js4
-rw-r--r--test/sequential/test-performance-eventloopdelay.js5
-rw-r--r--test/sequential/test-timers-block-eventloop.js4
-rw-r--r--test/sequential/test-timers-blocking-callback.js4
-rw-r--r--test/sequential/test-timers-set-interval-excludes-callback-duration.js6
9 files changed, 20 insertions, 23 deletions
diff --git a/test/common/README.md b/test/common/README.md
index 5f8b6cb309..11827d9743 100644
--- a/test/common/README.md
+++ b/test/common/README.md
@@ -45,11 +45,6 @@ tasks.
Takes `whitelist` and concats that with predefined `knownGlobals`.
-### busyLoop(time)
-* `time` [<number>][]
-
-Blocks for `time` amount of time.
-
### canCreateSymLink()
* return [<boolean>][]
diff --git a/test/common/index.js b/test/common/index.js
index 09b7f55778..1be7872081 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -481,12 +481,6 @@ function nodeProcessAborted(exitCode, signal) {
}
}
-function busyLoop(time) {
- const startTime = Date.now();
- const stopTime = startTime + time;
- while (Date.now() < stopTime) {}
-}
-
function isAlive(pid) {
try {
process.kill(pid, 'SIGCONT');
@@ -744,7 +738,6 @@ function runWithInvalidFD(func) {
module.exports = {
allowGlobals,
buildType,
- busyLoop,
canCreateSymLink,
childShouldThrowAndAbort,
createZeroFilledFile,
diff --git a/test/common/index.mjs b/test/common/index.mjs
index 54f6dc7f17..a5774fc008 100644
--- a/test/common/index.mjs
+++ b/test/common/index.mjs
@@ -39,7 +39,6 @@ const {
skip,
ArrayStream,
nodeProcessAborted,
- busyLoop,
isAlive,
expectWarning,
expectsError,
@@ -86,7 +85,6 @@ export {
skip,
ArrayStream,
nodeProcessAborted,
- busyLoop,
isAlive,
expectWarning,
expectsError,
diff --git a/test/parallel/test-timers-nested.js b/test/parallel/test-timers-nested.js
index 0ff228abf5..b983b002c5 100644
--- a/test/parallel/test-timers-nested.js
+++ b/test/parallel/test-timers-nested.js
@@ -1,7 +1,9 @@
+// Flags: --expose-internals
'use strict';
-const common = require('../common');
+require('../common');
const assert = require('assert');
+const { sleep } = require('internal/util');
// Make sure we test 0ms timers, since they would had always wanted to run on
// the current tick, and greater than 0ms timers, for scenarios where the
@@ -23,7 +25,7 @@ scenarios.forEach(function(delay) {
// Busy loop for the same timeout used for the nested timer to ensure that
// we are in fact expiring the nested timer.
- common.busyLoop(delay);
+ sleep(delay);
// The purpose of running this assert in nextTick is to make sure it runs
// after A but before the next iteration of the libuv event loop.
diff --git a/test/parallel/test-timers-next-tick.js b/test/parallel/test-timers-next-tick.js
index 89ebf6c8c1..1233501366 100644
--- a/test/parallel/test-timers-next-tick.js
+++ b/test/parallel/test-timers-next-tick.js
@@ -1,6 +1,8 @@
+// Flags: --expose-internals
'use strict';
const common = require('../common');
+const { sleep } = require('internal/util');
// This test verifies that the next tick queue runs after each
// individual Timeout, as well as each individual Immediate.
@@ -16,7 +18,7 @@ const t2 = setTimeout(common.mustNotCall(), 1);
const t3 = setTimeout(common.mustNotCall(), 1);
setTimeout(common.mustCall(), 1);
-common.busyLoop(5);
+sleep(5);
setImmediate(common.mustCall(() => {
process.nextTick(() => {
diff --git a/test/sequential/test-performance-eventloopdelay.js b/test/sequential/test-performance-eventloopdelay.js
index 7b9527b386..8e7ee4f0ad 100644
--- a/test/sequential/test-performance-eventloopdelay.js
+++ b/test/sequential/test-performance-eventloopdelay.js
@@ -1,4 +1,4 @@
-// Flags: --expose-gc
+// Flags: --expose-gc --expose-internals
'use strict';
const common = require('../common');
@@ -6,6 +6,7 @@ const assert = require('assert');
const {
monitorEventLoopDelay
} = require('perf_hooks');
+const { sleep } = require('internal/util');
{
const histogram = monitorEventLoopDelay();
@@ -54,7 +55,7 @@ const {
histogram.enable();
let m = 5;
function spinAWhile() {
- common.busyLoop(1000);
+ sleep(1000);
if (--m > 0) {
setTimeout(spinAWhile, common.platformTimeout(500));
} else {
diff --git a/test/sequential/test-timers-block-eventloop.js b/test/sequential/test-timers-block-eventloop.js
index 811216fcb2..6118695c92 100644
--- a/test/sequential/test-timers-block-eventloop.js
+++ b/test/sequential/test-timers-block-eventloop.js
@@ -1,7 +1,9 @@
+// Flags: --expose-internals
'use strict';
const common = require('../common');
const assert = require('assert');
+const { sleep } = require('internal/util');
let called = false;
const t1 = setInterval(() => {
@@ -14,5 +16,5 @@ const t1 = setInterval(() => {
}, 10);
const t2 = setInterval(() => {
- common.busyLoop(20);
+ sleep(20);
}, 10);
diff --git a/test/sequential/test-timers-blocking-callback.js b/test/sequential/test-timers-blocking-callback.js
index 053bc767b8..a5e0f596a3 100644
--- a/test/sequential/test-timers-blocking-callback.js
+++ b/test/sequential/test-timers-blocking-callback.js
@@ -1,3 +1,4 @@
+// Flags: --expose-internals
'use strict';
/*
@@ -25,6 +26,7 @@
const common = require('../common');
const assert = require('assert');
+const { sleep } = require('internal/util');
const TIMEOUT = 100;
@@ -65,7 +67,7 @@ function blockingCallback(retry, callback) {
return callback();
} else {
// Block by busy-looping to trigger the issue
- common.busyLoop(TIMEOUT);
+ sleep(TIMEOUT);
timeCallbackScheduled = Date.now();
setTimeout(blockingCallback.bind(null, retry, callback), TIMEOUT);
diff --git a/test/sequential/test-timers-set-interval-excludes-callback-duration.js b/test/sequential/test-timers-set-interval-excludes-callback-duration.js
index 90eb16b0e2..b32c7e7e3c 100644
--- a/test/sequential/test-timers-set-interval-excludes-callback-duration.js
+++ b/test/sequential/test-timers-set-interval-excludes-callback-duration.js
@@ -1,13 +1,15 @@
+// Flags: --expose-internals
'use strict';
-const common = require('../common');
+require('../common');
const assert = require('assert');
+const { sleep } = require('internal/util');
let cntr = 0;
let first;
const t = setInterval(() => {
cntr++;
if (cntr === 1) {
- common.busyLoop(100);
+ sleep(100);
// Ensure that the event loop passes before the second interval
setImmediate(() => assert.strictEqual(cntr, 1));
first = Date.now();