From 5217c524185711b4300085a1888c17f9404a8a44 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 6 Oct 2018 18:27:54 -0700 Subject: [PATCH] assert: remove internal errorCache property The internal assert module exposed an errorCache property solely for testing. It is no longer necessary. Remove it. PR-URL: https://github.com/nodejs/node/pull/23304 Reviewed-By: Ruben Bridgewater Reviewed-By: Sakthipriyan Vairamani --- lib/assert.js | 4 +++- lib/internal/assert.js | 3 +-- .../parallel/test-assert-builtins-not-read-from-filesystem.js | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/assert.js b/lib/assert.js index 0f3d770358f7c6..9990d0e888e1c5 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -27,12 +27,14 @@ const { codes: { ERR_INVALID_ARG_VALUE, ERR_INVALID_RETURN_VALUE } } = require('internal/errors'); -const { AssertionError, errorCache } = require('internal/assert'); +const { AssertionError } = require('internal/assert'); const { openSync, closeSync, readSync } = require('fs'); const { inspect, types: { isPromise, isRegExp } } = require('util'); const { EOL } = require('internal/constants'); const { NativeModule } = require('internal/bootstrap/loaders'); +const errorCache = new Map(); + let isDeepEqual; let isDeepStrictEqual; let parseExpressionAt; diff --git a/lib/internal/assert.js b/lib/internal/assert.js index e174cddb60a4e3..829f6663191dff 100644 --- a/lib/internal/assert.js +++ b/lib/internal/assert.js @@ -396,6 +396,5 @@ class AssertionError extends Error { } module.exports = { - AssertionError, - errorCache: new Map() + AssertionError }; diff --git a/test/parallel/test-assert-builtins-not-read-from-filesystem.js b/test/parallel/test-assert-builtins-not-read-from-filesystem.js index 7855f830add10b..7a713a2ea432c1 100644 --- a/test/parallel/test-assert-builtins-not-read-from-filesystem.js +++ b/test/parallel/test-assert-builtins-not-read-from-filesystem.js @@ -19,13 +19,13 @@ if (process.argv[2] !== 'child') { e.emit('hello', false); } catch (err) { const frames = err.stack.split('\n'); - const [, filename, , ] = frames[1].match(/\((.+):(\d+):(\d+)\)/); + const [, filename, line, column] = frames[1].match(/\((.+):(\d+):(\d+)\)/); // Spawn a child process to avoid the error having been cached in the assert // module's `errorCache` Map. const { output, status, error } = spawnSync(process.execPath, - [process.argv[1], 'child', filename], + [process.argv[1], 'child', filename, line, column], { cwd: tmpdir.path, env: process.env }); assert.ifError(error); assert.strictEqual(status, 0, `Exit code: ${status}\n${output}`);