From 7f56307a02061b1663a5ed94c6808f3227d212a1 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 24 Apr 2021 21:34:48 -0700 Subject: [PATCH] test: move slower tests into pummel and skip on slow devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move slower tests to pummel and skip on Raspberry Pi devices in CI. Refs: https://github.com/nodejs/node/pull/34289#issuecomment-823655915 PR-URL: https://github.com/nodejs/node/pull/38395 Reviewed-By: Michaël Zasso Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Filip Skokan --- test/pummel/test-fs-watch-system-limit.js | 12 ++++++++++-- .../test-heapsnapshot-near-heap-limit-bounded.js | 8 +++++++- .../test-heapsnapshot-near-heap-limit.js | 6 ++++++ .../test-net-bytes-per-incoming-chunk-overhead.js | 9 ++++++++- .../test-webcrypto-derivebits-pbkdf2.js | 8 +++++++- 5 files changed, 38 insertions(+), 5 deletions(-) rename test/{parallel => pummel}/test-heapsnapshot-near-heap-limit-bounded.js (82%) rename test/{parallel => pummel}/test-heapsnapshot-near-heap-limit.js (94%) rename test/{sequential => pummel}/test-net-bytes-per-incoming-chunk-overhead.js (85%) rename test/{parallel => pummel}/test-webcrypto-derivebits-pbkdf2.js (99%) diff --git a/test/pummel/test-fs-watch-system-limit.js b/test/pummel/test-fs-watch-system-limit.js index ce390dd3d0bb83..6662986a1a8ee0 100644 --- a/test/pummel/test-fs-watch-system-limit.js +++ b/test/pummel/test-fs-watch-system-limit.js @@ -5,10 +5,18 @@ const child_process = require('child_process'); const fs = require('fs'); const stream = require('stream'); -if (!common.isLinux) +if (!common.isLinux) { common.skip('The fs watch limit is OS-dependent'); -if (!common.enoughTestCpu) +} + +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'); +} try { // Ensure inotify limit is low enough for the test to actually exercise the diff --git a/test/parallel/test-heapsnapshot-near-heap-limit-bounded.js b/test/pummel/test-heapsnapshot-near-heap-limit-bounded.js similarity index 82% rename from test/parallel/test-heapsnapshot-near-heap-limit-bounded.js rename to test/pummel/test-heapsnapshot-near-heap-limit-bounded.js index a57b9a8fc4b5e5..0ad6a898d126eb 100644 --- a/test/parallel/test-heapsnapshot-near-heap-limit-bounded.js +++ b/test/pummel/test-heapsnapshot-near-heap-limit-bounded.js @@ -1,6 +1,12 @@ 'use strict'; -require('../common'); +const common = require('../common'); + +if ((process.config.variables.arm_version === '6') || + (process.config.variables.arm_version === '7')) { + common.skip('Too slow for armv6 and armv7 bots'); +} + const tmpdir = require('../common/tmpdir'); const assert = require('assert'); const { spawnSync } = require('child_process'); diff --git a/test/parallel/test-heapsnapshot-near-heap-limit.js b/test/pummel/test-heapsnapshot-near-heap-limit.js similarity index 94% rename from test/parallel/test-heapsnapshot-near-heap-limit.js rename to test/pummel/test-heapsnapshot-near-heap-limit.js index 5743f71a3f568c..6651f2ae9f52d9 100644 --- a/test/parallel/test-heapsnapshot-near-heap-limit.js +++ b/test/pummel/test-heapsnapshot-near-heap-limit.js @@ -1,6 +1,12 @@ 'use strict'; const common = require('../common'); + +if ((process.config.variables.arm_version === '6') || + (process.config.variables.arm_version === '7')) { + common.skip('Too slow for armv6 and armv7 bots'); +} + const tmpdir = require('../common/tmpdir'); const assert = require('assert'); const { spawnSync } = require('child_process'); diff --git a/test/sequential/test-net-bytes-per-incoming-chunk-overhead.js b/test/pummel/test-net-bytes-per-incoming-chunk-overhead.js similarity index 85% rename from test/sequential/test-net-bytes-per-incoming-chunk-overhead.js rename to test/pummel/test-net-bytes-per-incoming-chunk-overhead.js index 7bcdfaa9f6f6aa..fed903c2639d99 100644 --- a/test/sequential/test-net-bytes-per-incoming-chunk-overhead.js +++ b/test/pummel/test-net-bytes-per-incoming-chunk-overhead.js @@ -2,8 +2,15 @@ 'use strict'; const common = require('../common'); -if (process.config.variables.asan) + +if (process.config.variables.asan) { common.skip('ASAN messes with memory measurements'); +} + +if ((process.config.variables.arm_version === '6') || + (process.config.variables.arm_version === '7')) { + common.skip('Too slow for armv6 and armv7 bots'); +} const assert = require('assert'); const net = require('net'); diff --git a/test/parallel/test-webcrypto-derivebits-pbkdf2.js b/test/pummel/test-webcrypto-derivebits-pbkdf2.js similarity index 99% rename from test/parallel/test-webcrypto-derivebits-pbkdf2.js rename to test/pummel/test-webcrypto-derivebits-pbkdf2.js index ed8279dae134dc..745071f3458aba 100644 --- a/test/parallel/test-webcrypto-derivebits-pbkdf2.js +++ b/test/pummel/test-webcrypto-derivebits-pbkdf2.js @@ -2,8 +2,14 @@ const common = require('../common'); -if (!common.hasCrypto) +if (!common.hasCrypto) { common.skip('missing crypto'); +} + +if ((process.config.variables.arm_version === '6') || + (process.config.variables.arm_version === '7')) { + common.skip('Too slow for armv6 and armv7 bots'); +} const assert = require('assert'); const { subtle } = require('crypto').webcrypto;