test: account for OOM risks in heapsnapshot-near-heap-limit tests

PR-URL: #37761 Fixes: #36961 Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Mar 24, 2021 · 9f61cbd · 9f61cbd
1 parent a520581
commit 9f61cbd
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/test/parallel/test-heapsnapshot-near-heap-limit-worker.js b/test/parallel/test-heapsnapshot-near-heap-limit-worker.js
@@ -26,11 +26,14 @@ const env = {
   console.log(child.stdout.toString());
   const stderr = child.stderr.toString();
   console.log(stderr);
-  // There should be one snapshot taken and then after the
-  // snapshot heap limit callback is popped, the OOM callback
-  // becomes effective.
-  assert(stderr.includes('ERR_WORKER_OUT_OF_MEMORY'));
-  const list = fs.readdirSync(tmpdir.path)
-    .filter((file) => file.endsWith('.heapsnapshot'));
-  assert.strictEqual(list.length, 1);
+  const risky = /Not generating snapshots because it's too risky/.test(stderr);
+  if (!risky) {
+    // There should be one snapshot taken and then after the
+    // snapshot heap limit callback is popped, the OOM callback
+    // becomes effective.
+    assert(stderr.includes('ERR_WORKER_OUT_OF_MEMORY'));
+    const list = fs.readdirSync(tmpdir.path)
+      .filter((file) => file.endsWith('.heapsnapshot'));
+    assert.strictEqual(list.length, 1);
+  }
 }
diff --git a/test/parallel/test-heapsnapshot-near-heap-limit.js b/test/parallel/test-heapsnapshot-near-heap-limit.js
@@ -58,12 +58,17 @@ const env = {
     env,
   });
   console.log(child.stdout.toString());
-  console.log(child.stderr.toString());
+  const stderr = child.stderr.toString();
+  console.log(stderr);
   assert(common.nodeProcessAborted(child.status, child.signal),
          'process should have aborted, but did not');
   const list = fs.readdirSync(tmpdir.path)
     .filter((file) => file.endsWith('.heapsnapshot'));
-  assert.strictEqual(list.length, 1);
+  const risky = [...stderr.matchAll(
+    /Not generating snapshots because it's too risky/g)].length;
+  assert(list.length + risky > 0 && list.length <= 3,
+         `Generated ${list.length} snapshots ` +
+                     `and ${risky} was too risky`);
 }
 
 {
@@ -79,10 +84,15 @@ const env = {
     env,
   });
   console.log(child.stdout.toString());
-  console.log(child.stderr.toString());
+  const stderr = child.stderr.toString();
+  console.log(stderr);
   assert(common.nodeProcessAborted(child.status, child.signal),
          'process should have aborted, but did not');
   const list = fs.readdirSync(tmpdir.path)
     .filter((file) => file.endsWith('.heapsnapshot'));
-  assert(list.length > 0 && list.length <= 3);
+  const risky = [...stderr.matchAll(
+    /Not generating snapshots because it's too risky/g)].length;
+  assert(list.length + risky > 0 && list.length <= 3,
+         `Generated ${list.length} snapshots ` +
+        `and ${risky} was too risky`);
 }
diff --git a/test/pummel/test-heapsnapshot-near-heap-limit-big.js b/test/pummel/test-heapsnapshot-near-heap-limit-big.js
@@ -34,10 +34,9 @@ if (!common.enoughTestMem)
          'process should have aborted, but did not');
   const list = fs.readdirSync(tmpdir.path)
     .filter((file) => file.endsWith('.heapsnapshot'));
-  if (list.length === 0) {
-    assert(stderr.includes(
-      'Not generating snapshots because it\'s too risky'));
-  } else {
-    assert(list.length > 0 && list.length <= 3);
-  }
+  const risky = [...stderr.matchAll(
+    /Not generating snapshots because it's too risky/g)].length;
+  assert(list.length + risky > 0 && list.length <= 3,
+         `Generated ${list.length} snapshots ` +
+    `and ${risky} was too risky`);
 }