From d48e00e5a30cc2f936209e586f2731ccdb811a17 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 3 Jan 2021 06:41:24 -0800 Subject: [PATCH] test: fix test-memory-usage.js for IBMi Newly added process.memoryUsage.rss() will presumably return 0 on IBMi the same way process.memoryUsage().rss does. Allow IBMi to skip the new assertion. The test was using a mix of `assert()` and `assert.ok()`. This change makes it consistently use `assert.ok()`. PR-URL: https://github.com/nodejs/node/pull/36758 Reviewed-By: Richard Lau Reviewed-By: Gireesh Punathil Reviewed-By: Daijiro Wachi Reviewed-By: Michael Dawson --- test/parallel/test-memory-usage.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/parallel/test-memory-usage.js b/test/parallel/test-memory-usage.js index 609244f5fc07fc..8e5ea4de5bf587 100644 --- a/test/parallel/test-memory-usage.js +++ b/test/parallel/test-memory-usage.js @@ -26,8 +26,11 @@ const assert = require('assert'); const r = process.memoryUsage(); // On IBMi, the rss memory always returns zero -if (!common.isIBMi) +if (!common.isIBMi) { assert.ok(r.rss > 0); + assert.ok(process.memoryUsage.rss() > 0); +} + assert.ok(r.heapTotal > 0); assert.ok(r.heapUsed > 0); assert.ok(r.external > 0); @@ -39,10 +42,8 @@ if (r.arrayBuffers > 0) { const ab = new ArrayBuffer(size); const after = process.memoryUsage(); - assert(after.external - r.external >= size, - `${after.external} - ${r.external} >= ${size}`); + assert.ok(after.external - r.external >= size, + `${after.external} - ${r.external} >= ${size}`); assert.strictEqual(after.arrayBuffers - r.arrayBuffers, size, `${after.arrayBuffers} - ${r.arrayBuffers} === ${size}`); } - -assert(process.memoryUsage.rss() > 0);