Skip to content

Commit f42e0e0

Browse files
committed
Sanitize timers.js positions in reporter logs
1 parent db5d2c3 commit f42e0e0

File tree

10 files changed

+16
-15
lines changed

10 files changed

+16
-15
lines changed

test-tap/helper/report.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ exports.sanitizers = {
6161
experimentalWarning: string => string.replace(/^\(node:\d+\) ExperimentalWarning.+\n/g, ''),
6262
lineEndings: string => replaceString(string, '\r\n', '\n'),
6363
posix: string => replaceString(string, '\\', '/'),
64+
timers: string => string.replace(/timers\.js:\d+:\d+/g, 'timers.js'),
6465
version: string => replaceString(string, `v${pkg.version}`, 'v1.0.0-beta.5.1')
6566
};
6667

test-tap/reporters/mini.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const run = (type, sanitizers = []) => t => {
1919

2020
const tty = new TTYStream({
2121
columns: 200,
22-
sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.version]
22+
sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.timers, report.sanitizers.version]
2323
});
2424
const reporter = new Reporter({
2525
projectDir: report.projectDir(type),

test-tap/reporters/mini.regular.v12.log

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,8 @@
504504
Error: Can’t catch me
505505

506506
› Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
507-
› listOnTimeout (internal/timers.js:549:17)
508-
› processTimers (internal/timers.js:492:7)
507+
› listOnTimeout (internal/timers.js)
508+
› processTimers (internal/timers.js)
509509

510510

511511

test-tap/reporters/mini.regular.v14.log

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,8 @@
504504
Error: Can’t catch me
505505

506506
› Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
507-
› listOnTimeout (internal/timers.js:551:17)
508-
› processTimers (internal/timers.js:494:7)
507+
› listOnTimeout (internal/timers.js)
508+
› processTimers (internal/timers.js)
509509

510510

511511

test-tap/reporters/tap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const run = (type, sanitizers = []) => t => {
1414

1515
const tty = new TTYStream({
1616
columns: 200,
17-
sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix]
17+
sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.timers]
1818
});
1919
const reporter = new TapReporter({
2020
projectDir: report.projectDir(type),

test-tap/reporters/tap.regular.v12.log

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ not ok 25 - Error: Can’t catch me
298298
message: Can’t catch me
299299
at: |-
300300
Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
301-
listOnTimeout (internal/timers.js:549:17)
302-
processTimers (internal/timers.js:492:7)
301+
listOnTimeout (internal/timers.js)
302+
processTimers (internal/timers.js)
303303
...
304304
---tty-stream-chunk-separator
305305
# uncaught-exception.js exited with a non-zero exit code: 1

test-tap/reporters/tap.regular.v14.log

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ not ok 25 - Error: Can’t catch me
298298
message: Can’t catch me
299299
at: |-
300300
Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
301-
listOnTimeout (internal/timers.js:551:17)
302-
processTimers (internal/timers.js:494:7)
301+
listOnTimeout (internal/timers.js)
302+
processTimers (internal/timers.js)
303303
...
304304
---tty-stream-chunk-separator
305305
# uncaught-exception.js exited with a non-zero exit code: 1

test-tap/reporters/verbose.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const run = (type, sanitizers = []) => t => {
1313

1414
const tty = new TTYStream({
1515
columns: 200,
16-
sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.version]
16+
sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.timers, report.sanitizers.version]
1717
});
1818
const reporter = new Reporter({
1919
projectDir: report.projectDir(type),

test-tap/reporters/verbose.regular.v12.log

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
Error: Can’t catch me
9595

9696
› Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
97-
› listOnTimeout (internal/timers.js:549:17)
98-
› processTimers (internal/timers.js:492:7)
97+
› listOnTimeout (internal/timers.js)
98+
› processTimers (internal/timers.js)
9999

100100
---tty-stream-chunk-separator
101101
✖ uncaught-exception.js exited with a non-zero exit code: 1

test-tap/reporters/verbose.regular.v14.log

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
Error: Can’t catch me
9595

9696
› Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
97-
› listOnTimeout (internal/timers.js:551:17)
98-
› processTimers (internal/timers.js:494:7)
97+
› listOnTimeout (internal/timers.js)
98+
› processTimers (internal/timers.js)
9999

100100
---tty-stream-chunk-separator
101101
✖ uncaught-exception.js exited with a non-zero exit code: 1

0 commit comments

Comments
 (0)