From f42e0e03a4f6f34d81a2f158b18af9f0a90b71bf Mon Sep 17 00:00:00 2001 From: Mark Wubben Date: Tue, 8 Sep 2020 10:39:57 +0200 Subject: [PATCH] Sanitize timers.js positions in reporter logs --- test-tap/helper/report.js | 1 + test-tap/reporters/mini.js | 2 +- test-tap/reporters/mini.regular.v12.log | 4 ++-- test-tap/reporters/mini.regular.v14.log | 4 ++-- test-tap/reporters/tap.js | 2 +- test-tap/reporters/tap.regular.v12.log | 4 ++-- test-tap/reporters/tap.regular.v14.log | 4 ++-- test-tap/reporters/verbose.js | 2 +- test-tap/reporters/verbose.regular.v12.log | 4 ++-- test-tap/reporters/verbose.regular.v14.log | 4 ++-- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/test-tap/helper/report.js b/test-tap/helper/report.js index b374dd6fa..1656cccaf 100644 --- a/test-tap/helper/report.js +++ b/test-tap/helper/report.js @@ -61,6 +61,7 @@ exports.sanitizers = { experimentalWarning: string => string.replace(/^\(node:\d+\) ExperimentalWarning.+\n/g, ''), lineEndings: string => replaceString(string, '\r\n', '\n'), posix: string => replaceString(string, '\\', '/'), + timers: string => string.replace(/timers\.js:\d+:\d+/g, 'timers.js'), version: string => replaceString(string, `v${pkg.version}`, 'v1.0.0-beta.5.1') }; diff --git a/test-tap/reporters/mini.js b/test-tap/reporters/mini.js index d06424b56..0c541157b 100644 --- a/test-tap/reporters/mini.js +++ b/test-tap/reporters/mini.js @@ -19,7 +19,7 @@ const run = (type, sanitizers = []) => t => { const tty = new TTYStream({ columns: 200, - sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.version] + sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.timers, report.sanitizers.version] }); const reporter = new Reporter({ projectDir: report.projectDir(type), diff --git a/test-tap/reporters/mini.regular.v12.log b/test-tap/reporters/mini.regular.v12.log index af1efa390..e4dfaac1a 100644 --- a/test-tap/reporters/mini.regular.v12.log +++ b/test-tap/reporters/mini.regular.v12.log @@ -504,8 +504,8 @@ Error: Can’t catch me › Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9) - › listOnTimeout (internal/timers.js:549:17) - › processTimers (internal/timers.js:492:7) + › listOnTimeout (internal/timers.js) + › processTimers (internal/timers.js) diff --git a/test-tap/reporters/mini.regular.v14.log b/test-tap/reporters/mini.regular.v14.log index cb509dedb..e4dfaac1a 100644 --- a/test-tap/reporters/mini.regular.v14.log +++ b/test-tap/reporters/mini.regular.v14.log @@ -504,8 +504,8 @@ Error: Can’t catch me › Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9) - › listOnTimeout (internal/timers.js:551:17) - › processTimers (internal/timers.js:494:7) + › listOnTimeout (internal/timers.js) + › processTimers (internal/timers.js) diff --git a/test-tap/reporters/tap.js b/test-tap/reporters/tap.js index 4290bc361..846f7f378 100644 --- a/test-tap/reporters/tap.js +++ b/test-tap/reporters/tap.js @@ -14,7 +14,7 @@ const run = (type, sanitizers = []) => t => { const tty = new TTYStream({ columns: 200, - sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix] + sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.timers] }); const reporter = new TapReporter({ projectDir: report.projectDir(type), diff --git a/test-tap/reporters/tap.regular.v12.log b/test-tap/reporters/tap.regular.v12.log index 92dabd285..1c549e76e 100644 --- a/test-tap/reporters/tap.regular.v12.log +++ b/test-tap/reporters/tap.regular.v12.log @@ -298,8 +298,8 @@ not ok 25 - Error: Can’t catch me message: Can’t catch me at: |- Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9) - listOnTimeout (internal/timers.js:549:17) - processTimers (internal/timers.js:492:7) + listOnTimeout (internal/timers.js) + processTimers (internal/timers.js) ... ---tty-stream-chunk-separator # uncaught-exception.js exited with a non-zero exit code: 1 diff --git a/test-tap/reporters/tap.regular.v14.log b/test-tap/reporters/tap.regular.v14.log index 7aafb489b..1c549e76e 100644 --- a/test-tap/reporters/tap.regular.v14.log +++ b/test-tap/reporters/tap.regular.v14.log @@ -298,8 +298,8 @@ not ok 25 - Error: Can’t catch me message: Can’t catch me at: |- Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9) - listOnTimeout (internal/timers.js:551:17) - processTimers (internal/timers.js:494:7) + listOnTimeout (internal/timers.js) + processTimers (internal/timers.js) ... ---tty-stream-chunk-separator # uncaught-exception.js exited with a non-zero exit code: 1 diff --git a/test-tap/reporters/verbose.js b/test-tap/reporters/verbose.js index 303bdcb54..3cf6f800b 100644 --- a/test-tap/reporters/verbose.js +++ b/test-tap/reporters/verbose.js @@ -13,7 +13,7 @@ const run = (type, sanitizers = []) => t => { const tty = new TTYStream({ columns: 200, - sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.version] + sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.timers, report.sanitizers.version] }); const reporter = new Reporter({ projectDir: report.projectDir(type), diff --git a/test-tap/reporters/verbose.regular.v12.log b/test-tap/reporters/verbose.regular.v12.log index dcc88f811..38a5fa0b2 100644 --- a/test-tap/reporters/verbose.regular.v12.log +++ b/test-tap/reporters/verbose.regular.v12.log @@ -94,8 +94,8 @@ Error: Can’t catch me › Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9) - › listOnTimeout (internal/timers.js:549:17) - › processTimers (internal/timers.js:492:7) + › listOnTimeout (internal/timers.js) + › processTimers (internal/timers.js) ---tty-stream-chunk-separator ✖ uncaught-exception.js exited with a non-zero exit code: 1 diff --git a/test-tap/reporters/verbose.regular.v14.log b/test-tap/reporters/verbose.regular.v14.log index 0514a3f43..38a5fa0b2 100644 --- a/test-tap/reporters/verbose.regular.v14.log +++ b/test-tap/reporters/verbose.regular.v14.log @@ -94,8 +94,8 @@ Error: Can’t catch me › Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9) - › listOnTimeout (internal/timers.js:551:17) - › processTimers (internal/timers.js:494:7) + › listOnTimeout (internal/timers.js) + › processTimers (internal/timers.js) ---tty-stream-chunk-separator ✖ uncaught-exception.js exited with a non-zero exit code: 1