Skip to content

[9.x backport] assert & util PRs #19230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BridgeAR wants to merge 21 commits into from
Closed

[9.x backport] assert & util PRs #19230

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c6aa5ff
doc: improve assert documentation
BridgeAR Nov 13, 2017
b3e4476
assert: add strict functionality export
BridgeAR Nov 13, 2017
da78022
assert: use object argument in innerFail
BridgeAR Dec 9, 2017
9664cc8
assert: fix throws and doesNotThrow stack frames
BridgeAR Dec 15, 2017
0ed963b
test: refactor common.expectsError
BridgeAR Dec 15, 2017
cc52dec
assert: improve assert.throws
BridgeAR Dec 9, 2017
f38be41
doc: improve .throws RegExp info
BridgeAR Dec 11, 2017
7f558d5
assert: .throws accept objects
BridgeAR Dec 10, 2017
fe9f098
assert: fix strict regression
BridgeAR Dec 28, 2017
49dc778
lib: handle `throw undefined` in assert.throws()
bnoordhuis Jan 7, 2018
5d88557
util: fix custom inspect description
BridgeAR Dec 9, 2017
f77f91d
util: rename util.inspect argument
BridgeAR Dec 9, 2017
fb85597
util: add util.inspect compact option
BridgeAR Dec 9, 2017
70ac318
assert: improve error messages
BridgeAR Dec 9, 2017
fae00e3
tty: add getColorDepth function
BridgeAR Jan 16, 2018
073cf69
tty: refactor to es6
BridgeAR Jan 17, 2018
4fbed71
assert: use destructuring for errors
BridgeAR Jan 22, 2018
6694f48
assert: fix throws trace
BridgeAR Feb 6, 2018
1ce2898
doc: document asserts Weak(Map|Set) behavior
BridgeAR Jan 19, 2018
ca8a591
assert: fix infinite loop
BridgeAR Feb 7, 2018
254f888
assert: show proper differences
BridgeAR Feb 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
assert: fix infinite loop 
In rare cirumstances it is possible to get a identical error diff.
In such a case the advances diffing runs into a infinite loop.
This fixes it by properly checking for extra entries.

PR-URL: #18611
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
@BridgeAR
BridgeAR committed Mar 8, 2018
commit ca8a59144eaf7dca02e7c0aee95c10320200c401
2 changes: 2 additions & 0 deletions lib/internal/errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ function createErrDiff(actual, expected, operator) {
}
actualLines.pop();
expectedLines.pop();
if (actualLines.length === 0 || expectedLines.length === 0)
break;
a = actualLines[actualLines.length - 1];
b = expectedLines[expectedLines.length - 1];
}
Expand Down
12 changes: 12 additions & 0 deletions test/parallel/test-assert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

const common = require('../common');
const assert = require('assert');
const { inspect } = require('util');
const a = assert;

function makeBlock(f) {
Expand Down Expand Up @@ -890,6 +891,17 @@ common.expectsError(
() => assert.deepEqual(Array(12).fill(1), Array(12).fill(2)),
{ message });

const obj1 = {};
const obj2 = { loop: 'forever' };
obj2[inspect.custom] = () => '{}';
// No infinite loop and no custom inspect.
assert.throws(() => assert.deepEqual(obj1, obj2), {
message: `${start}\n` +
`${actExp}\n` +
'\n' +
' {}'
});

// notDeepEqual tests
message = 'Identical input passed to notDeepStrictEqual:\n[\n 1\n]';
assert.throws(
Expand Down