[v12.x backport] test: refactor common.expectsError #31449

sxa · 2020-01-21T22:05:07Z

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
commit message follows commit guidelines

Ever had one of those moments when you wish you hadn't started a backport but wanted to see it through to completion? I'm glad this is done now and it'll definitely make subsequent backports easer (would have helped for the other one I did this evening). Understandable there are quite a few adjustments in this due to differences in test cases between v12.x and master which meant that many fixups were required, but this now passes the tests.

I've only verified that this is ok on xLinux.

If someone can kick off the test-commit job that would be appreciated.

For reviewers, it's probably fairly obvious but the "fixup" commit in here contains most of the changes I had to make manually (plus a couple of typo fixes from my first merge resolution)

nodejs-github-bot · 2020-01-21T22:19:12Z

CI: https://ci.nodejs.org/job/node-test-pull-request/28552/

sxa · 2020-01-21T23:08:40Z

https://ci.nodejs.org/job/node-test-commit-linux/nodes=centos7-64-gcc6/32389/consoleFull (Thanks @BethGriggs for kicking it off) failed the PR test job due to the failure shown below with test-http2-reset-fllood. Since this PR only changes tests it seems likely that this is a machine specific issue, or I was just unlucky on an intermittent test (It's known flakey on FreeBSD as per #29802 - perhaps #30534 will assist with this - although if it's already been backported - it's called out in #31368 - then perhaps that hasn't fixed it!). Other platforms/Linux distributions that have completed as I write this have not failed in the same way as per https://ci.nodejs.org/job/node-test-commit/35039/console

22:28:15 not ok 1169 parallel/test-http2-reset-flood
22:28:15   ---
22:28:15   duration_ms: 0.328
22:28:15   severity: fail
22:28:15   exitcode: 1
22:28:15   stack: |-
22:28:15     events.js:298
22:28:15           throw er; // Unhandled 'error' event
22:28:15           ^
22:28:15     
22:28:15     Error: This socket has been ended by the other party
22:28:15         at Socket.writeAfterFIN [as write] (net.js:451:14)
22:28:15         at Immediate.writeRequests (/home/iojs/build/workspace/node-test-commit-linux/nodes/centos7-64-gcc6/test/parallel/test-http2-reset-flood.js:72:12)
22:28:15         at processImmediate (internal/timers.js:456:21)
22:28:15     Emitted 'error' event on Socket instance at:
22:28:15         at emitErrorNT (net.js:1336:8)
22:28:15         at processTicksAndRejections (internal/process/task_queues.js:84:21) {
22:28:15       code: 'EPIPE'
22:28:15     }
22:28:15   ...

nodejs-github-bot · 2020-01-21T23:29:45Z

CI: https://ci.nodejs.org/job/node-test-pull-request/28555/

nodejs-github-bot · 2020-01-22T11:52:44Z

CI: https://ci.nodejs.org/job/node-test-pull-request/28559/

test/parallel/test-stream-unshift-read-race.js

test/parallel/test-fs-whatwg-url.js

test/parallel/test-crypto.js

sxa · 2020-01-22T13:48:22Z

All comments addressed @BridgeAR if you want to take another look.

sxa · 2020-01-22T13:49:43Z

CI: https://ci.nodejs.org/job/node-test-pull-request/28559/

This passed although doesn't include my latest (minor) tweak to address review comments

MylesBorins · 2020-01-30T23:12:30Z

I've rebased against v12.x to fixed conflicts.

nodejs-github-bot · 2020-01-30T23:13:02Z

CI: https://ci.nodejs.org/job/node-test-pull-request/28788/

This completely refactors the `expectsError` behavior: so far it's almost identical to `assert.throws(fn, object)` in case it was used with a function as first argument. It had a magical property check that allowed to verify a functions `type` in case `type` was passed used in the validation object. This pattern is now completely removed and `assert.throws()` should be used instead. The main intent for `common.expectsError()` is to verify error cases for callback based APIs. This is now more flexible by accepting all validation possibilites that `assert.throws()` accepts as well. No magical properties exist anymore. This reduces surprising behavior for developers who are not used to the Node.js core code base. This has the side effect that `common` is used significantly less frequent. Backport-PR-URL: nodejs#31449 PR-URL: nodejs#31092 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>

MylesBorins · 2020-04-01T06:21:11Z

rebased

nodejs-github-bot · 2020-04-01T06:21:44Z

CI: https://ci.nodejs.org/job/node-test-pull-request/30315/
Rerun bsd: https://ci.nodejs.org/job/node-test-commit-freebsd/32478/

MylesBorins · 2020-04-01T06:51:55Z

BSD failure might be known flake

#29802
#32595

This completely refactors the `expectsError` behavior: so far it's almost identical to `assert.throws(fn, object)` in case it was used with a function as first argument. It had a magical property check that allowed to verify a functions `type` in case `type` was passed used in the validation object. This pattern is now completely removed and `assert.throws()` should be used instead. The main intent for `common.expectsError()` is to verify error cases for callback based APIs. This is now more flexible by accepting all validation possibilites that `assert.throws()` accepts as well. No magical properties exist anymore. This reduces surprising behavior for developers who are not used to the Node.js core code base. This has the side effect that `common` is used significantly less frequent. Backport-PR-URL: #31449 PR-URL: #31092 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>

MylesBorins · 2020-04-01T16:59:41Z

landed in d568efc

sxa · 2020-04-01T17:14:56Z

Thanks @MylesBorins - I hadn't got back to doing the rebase after the release went out as it looked rather non-trivial to redo with the modified history on this one, but should be a good one to get in.

MylesBorins · 2020-04-01T19:15:45Z

@sxa555 it is landed and in!

FWIW I made a new branch off of staging and cherry-picked your initial commit (rather than rebasing). There was only a single conflict, so it was rather straight forward all things considered

nodejs-github-bot added addons Issues and PRs related to native addons. async_hooks Issues and PRs related to the async hooks subsystem. esm Issues and PRs related to the ECMAScript Modules implementation. test Issues and PRs related to the tests. v12.x labels Jan 21, 2020

sxa requested review from BridgeAR and targos January 21, 2020 22:06

sxa force-pushed the v12.x-31092 branch from f9fa225 to 2bd7704 Compare January 22, 2020 11:50

BridgeAR approved these changes Jan 22, 2020

View reviewed changes

test/parallel/test-stream-unshift-read-race.js Show resolved Hide resolved

test/parallel/test-fs-whatwg-url.js Outdated Show resolved Hide resolved

test/parallel/test-crypto.js Outdated Show resolved Hide resolved

sxa force-pushed the v12.x-31092 branch 5 times, most recently from 44a6565 to 9f59f39 Compare January 22, 2020 13:44

MylesBorins force-pushed the v12.x-31092 branch from 9f59f39 to a7afcbb Compare January 30, 2020 23:12

BethGriggs force-pushed the v12.x-staging branch from 67ec97a to fc7b27e Compare February 6, 2020 02:51

guybedford removed the esm Issues and PRs related to the ECMAScript Modules implementation. label Mar 12, 2020

codebytere force-pushed the v12.x-staging branch from a01fb4a to e5dc2fb Compare March 23, 2020 16:01

codebytere force-pushed the v12.x-staging branch 2 times, most recently from 63a03d2 to d577190 Compare March 31, 2020 23:57

MylesBorins force-pushed the v12.x-31092 branch from a7afcbb to 7e1c8e6 Compare April 1, 2020 06:21

MylesBorins closed this Apr 1, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[v12.x backport] test: refactor common.expectsError #31449

[v12.x backport] test: refactor common.expectsError #31449

sxa commented Jan 21, 2020 •

edited

nodejs-github-bot commented Jan 21, 2020

sxa commented Jan 21, 2020

nodejs-github-bot commented Jan 21, 2020

nodejs-github-bot commented Jan 22, 2020

sxa commented Jan 22, 2020

sxa commented Jan 22, 2020 •

edited

MylesBorins commented Jan 30, 2020

nodejs-github-bot commented Jan 30, 2020

MylesBorins commented Apr 1, 2020

nodejs-github-bot commented Apr 1, 2020 •

edited by MylesBorins

MylesBorins commented Apr 1, 2020

MylesBorins commented Apr 1, 2020

sxa commented Apr 1, 2020 •

edited

MylesBorins commented Apr 1, 2020

[v12.x backport] test: refactor common.expectsError #31449

[v12.x backport] test: refactor common.expectsError #31449

Conversation

sxa commented Jan 21, 2020 • edited

Checklist

nodejs-github-bot commented Jan 21, 2020

sxa commented Jan 21, 2020

nodejs-github-bot commented Jan 21, 2020

nodejs-github-bot commented Jan 22, 2020

sxa commented Jan 22, 2020

sxa commented Jan 22, 2020 • edited

MylesBorins commented Jan 30, 2020

nodejs-github-bot commented Jan 30, 2020

MylesBorins commented Apr 1, 2020

nodejs-github-bot commented Apr 1, 2020 • edited by MylesBorins

MylesBorins commented Apr 1, 2020

MylesBorins commented Apr 1, 2020

sxa commented Apr 1, 2020 • edited

MylesBorins commented Apr 1, 2020

sxa commented Jan 21, 2020 •

edited

sxa commented Jan 22, 2020 •

edited

nodejs-github-bot commented Apr 1, 2020 •

edited by MylesBorins

sxa commented Apr 1, 2020 •

edited