summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2021-06-26 08:25:29 -0700
committerRich Trott <rtrott@gmail.com>2021-07-04 07:26:59 -0700
commit32b6f4be5373ecca3ac2a749f5760c177a5af220 (patch)
tree2dfff6f9b8af068fbce6ef90d5e673b9c034be02 /test
parent7868062ddb3556ac33acde4471ebe703066db270 (diff)
downloadnode-new-32b6f4be5373ecca3ac2a749f5760c177a5af220.tar.gz
test: remove common.enoughTestCpu
All hosts in CI return true for common.enoughTestCpu. At least for our CI, it is always true, so we can remove it. PR-URL: https://github.com/nodejs/node/pull/39161 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/common/README.md7
-rw-r--r--test/common/index.js5
-rw-r--r--test/common/index.mjs2
-rw-r--r--test/pummel/test-fs-watch-system-limit.js4
-rw-r--r--test/tick-processor/test-tick-processor-builtin.js3
-rw-r--r--test/tick-processor/test-tick-processor-cpp-core.js3
-rw-r--r--test/tick-processor/test-tick-processor-polyfill-brokenfile.js3
-rw-r--r--test/tick-processor/test-tick-processor-preprocess-flag.js3
-rw-r--r--test/tick-processor/test-tick-processor-unknown.js3
9 files changed, 0 insertions, 33 deletions
diff --git a/test/common/README.md b/test/common/README.md
index 7b76c1a746..6b42fa1070 100644
--- a/test/common/README.md
+++ b/test/common/README.md
@@ -62,13 +62,6 @@ On non-Windows platforms, this always returns `true`.
Creates a 10 MB file of all null characters.
-### `enoughTestCpu`
-
-* [&lt;boolean>][]
-
-Indicates if there is more than 1 CPU or that the single CPU has a speed of at
-least 1 GHz.
-
### `enoughTestMem`
* [&lt;boolean>][]
diff --git a/test/common/index.js b/test/common/index.js
index a5d74a3c5b..1ffe7b4804 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -788,11 +788,6 @@ const common = {
skipIfInspectorDisabled,
skipIfWorker,
- get enoughTestCpu() {
- const cpus = require('os').cpus();
- return Array.isArray(cpus) && (cpus.length > 1 || cpus[0].speed > 999);
- },
-
get enoughTestMem() {
return require('os').totalmem() > 0x70000000; /* 1.75 Gb */
},
diff --git a/test/common/index.mjs b/test/common/index.mjs
index 9700fe8039..1824497ff6 100644
--- a/test/common/index.mjs
+++ b/test/common/index.mjs
@@ -18,7 +18,6 @@ const {
isLinux,
isOSX,
enoughTestMem,
- enoughTestCpu,
buildType,
localIPv6Hosts,
opensslCli,
@@ -64,7 +63,6 @@ export {
isLinux,
isOSX,
enoughTestMem,
- enoughTestCpu,
buildType,
localIPv6Hosts,
opensslCli,
diff --git a/test/pummel/test-fs-watch-system-limit.js b/test/pummel/test-fs-watch-system-limit.js
index 6662986a1a..9c378bec6d 100644
--- a/test/pummel/test-fs-watch-system-limit.js
+++ b/test/pummel/test-fs-watch-system-limit.js
@@ -9,10 +9,6 @@ if (!common.isLinux) {
common.skip('The fs watch limit is OS-dependent');
}
-if (!common.enoughTestCpu) {
- common.skip('This test is resource-intensive');
-}
-
if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
diff --git a/test/tick-processor/test-tick-processor-builtin.js b/test/tick-processor/test-tick-processor-builtin.js
index 1f38abe08c..f01f098668 100644
--- a/test/tick-processor/test-tick-processor-builtin.js
+++ b/test/tick-processor/test-tick-processor-builtin.js
@@ -2,9 +2,6 @@
const common = require('../common');
const { isCPPSymbolsNotMapped } = require('./util');
-if (!common.enoughTestCpu)
- common.skip('test is CPU-intensive');
-
if (isCPPSymbolsNotMapped) {
common.skip('C++ symbols are not mapped for this os.');
}
diff --git a/test/tick-processor/test-tick-processor-cpp-core.js b/test/tick-processor/test-tick-processor-cpp-core.js
index e76d99ab09..89943cca5c 100644
--- a/test/tick-processor/test-tick-processor-cpp-core.js
+++ b/test/tick-processor/test-tick-processor-cpp-core.js
@@ -2,9 +2,6 @@
const common = require('../common');
const { isCPPSymbolsNotMapped } = require('./util');
-if (!common.enoughTestCpu)
- common.skip('test is CPU-intensive');
-
if (isCPPSymbolsNotMapped) {
common.skip('C++ symbols are not mapped for this os.');
}
diff --git a/test/tick-processor/test-tick-processor-polyfill-brokenfile.js b/test/tick-processor/test-tick-processor-polyfill-brokenfile.js
index 98cbf5bb41..926c96e4d7 100644
--- a/test/tick-processor/test-tick-processor-polyfill-brokenfile.js
+++ b/test/tick-processor/test-tick-processor-polyfill-brokenfile.js
@@ -4,9 +4,6 @@ const { isCPPSymbolsNotMapped } = require('./util');
const tmpdir = require('../common/tmpdir');
tmpdir.refresh();
-if (!common.enoughTestCpu)
- common.skip('test is CPU-intensive');
-
if (isCPPSymbolsNotMapped) {
common.skip('C++ symbols are not mapped for this OS.');
}
diff --git a/test/tick-processor/test-tick-processor-preprocess-flag.js b/test/tick-processor/test-tick-processor-preprocess-flag.js
index 8b1ec9920f..b003f7c6b8 100644
--- a/test/tick-processor/test-tick-processor-preprocess-flag.js
+++ b/test/tick-processor/test-tick-processor-preprocess-flag.js
@@ -2,9 +2,6 @@
const common = require('../common');
const { isCPPSymbolsNotMapped } = require('./util');
-if (!common.enoughTestCpu)
- common.skip('test is CPU-intensive');
-
if (isCPPSymbolsNotMapped) {
common.skip('C++ symbols are not mapped for this os.');
}
diff --git a/test/tick-processor/test-tick-processor-unknown.js b/test/tick-processor/test-tick-processor-unknown.js
index f894ae919a..42208f3bb3 100644
--- a/test/tick-processor/test-tick-processor-unknown.js
+++ b/test/tick-processor/test-tick-processor-unknown.js
@@ -9,9 +9,6 @@ const common = require('../common');
if (common.isAIX)
common.skip('AIX address range too big for scripts.');
-if (!common.enoughTestCpu)
- common.skip('test is CPU-intensive');
-
const base = require('./tick-processor-base.js');
// Unknown checked for to prevent flakiness, if pattern is not found,