(v6.x backport) tools: enforce two arguments in assert.throws #13785

targos · 2017-06-19T08:43:59Z

Backport of #12270
This includes backports of multiple other PRs that are required:

Checklist

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

Affected core subsystem(s)

PR-URL: nodejs#10807 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]>

Adding regular expression as an argument to an assert.throws(). PR-URL: nodejs#11215 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]>

* verify error message * use arrow funcs PR-URL: nodejs#11203 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]>

* validate errors in assert.throws * use arrow functions PR-URL: nodejs#10752 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

* validate the errors for all assert.throws * use arrow functions PR-URL: nodejs#10734 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

* use const and let instead of var * use assert.strictEqual or assert.strictDeepEqual instead of assert.equal * use arrow functions * swap assertions arguments to match the standard * validate the error for assert.throws PR-URL: nodejs#10681 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

makeCallback and makeStatsCallback are both tested intedependently. PR-URL: nodejs#12140 Fixes: nodejs#12136 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

* use arrow funcion instead of function expression * add second argument to method assert.throws * check error messages from beginning to the end using ^ and $ PR-URL: nodejs#10908 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Adrian Estrada <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

PR-URL: nodejs#11622 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]>

This adds RegExp or error constructor arguments to the remaining places where it is missing in preparation for the commit that will enforce the presence of at least two arguments. PR-URL: nodejs#12270 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>

Enables the requireTwo option of our custom rule. PR-URL: nodejs#12270 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>

gibfahn · 2017-06-19T11:11:13Z

Most of the dont-land labels on the PRs you're including seem fine, but #10807 (comment) suggests that that PR depends on a semver-major.

Just to confirm, you included that PR without including the semver-major change right?

targos · 2017-06-19T11:16:33Z

Just to confirm, you included that PR without including the semver-major change right?

Yes. That semver-major change is the one that adds support for Uint8Array to buffer methods. I cherry-picked the test changes and changed the RegExp to match the message in v6.x.

gibfahn · 2017-06-19T21:52:35Z

CI: https://ci.nodejs.org/job/node-test-commit/10664/

PR-URL: #10807 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]>

Adding regular expression as an argument to an assert.throws(). PR-URL: #11215 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]>

* verify error message * use arrow funcs PR-URL: #11203 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]>

* validate errors in assert.throws * use arrow functions PR-URL: #10752 Backport-PR-URL: #13785 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

* validate the errors for all assert.throws * use arrow functions PR-URL: #10734 Backport-PR-URL: #13785 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

* use const and let instead of var * use assert.strictEqual or assert.strictDeepEqual instead of assert.equal * use arrow functions * swap assertions arguments to match the standard * validate the error for assert.throws PR-URL: #10681 Backport-PR-URL: #13785 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

makeCallback and makeStatsCallback are both tested intedependently. PR-URL: #12140 Backport-PR-URL: #13785 Fixes: #12136 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

* use arrow funcion instead of function expression * add second argument to method assert.throws * check error messages from beginning to the end using ^ and $ PR-URL: #10908 Backport-PR-URL: #13785 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Adrian Estrada <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

PR-URL: #11622 Backport-PR-URL: #13785 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]>

This adds RegExp or error constructor arguments to the remaining places where it is missing in preparation for the commit that will enforce the presence of at least two arguments. PR-URL: #12270 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>

Enables the requireTwo option of our custom rule. PR-URL: #12270 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>

PR-URL: #10807 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]>

Adding regular expression as an argument to an assert.throws(). PR-URL: #11215 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]>

* verify error message * use arrow funcs PR-URL: #11203 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]>

* validate errors in assert.throws * use arrow functions PR-URL: #10752 Backport-PR-URL: #13785 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

* validate the errors for all assert.throws * use arrow functions PR-URL: #10734 Backport-PR-URL: #13785 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

* use const and let instead of var * use assert.strictEqual or assert.strictDeepEqual instead of assert.equal * use arrow functions * swap assertions arguments to match the standard * validate the error for assert.throws PR-URL: #10681 Backport-PR-URL: #13785 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

makeCallback and makeStatsCallback are both tested intedependently. PR-URL: #12140 Backport-PR-URL: #13785 Fixes: #12136 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

* use arrow funcion instead of function expression * add second argument to method assert.throws * check error messages from beginning to the end using ^ and $ PR-URL: #10908 Backport-PR-URL: #13785 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Adrian Estrada <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

PR-URL: #11622 Backport-PR-URL: #13785 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]>

This adds RegExp or error constructor arguments to the remaining places where it is missing in preparation for the commit that will enforce the presence of at least two arguments. PR-URL: #12270 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>

Enables the requireTwo option of our custom rule. PR-URL: #12270 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>

PR-URL: #10807 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]>

Adding regular expression as an argument to an assert.throws(). PR-URL: #11215 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]>

* verify error message * use arrow funcs PR-URL: #11203 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]>

* validate errors in assert.throws * use arrow functions PR-URL: #10752 Backport-PR-URL: #13785 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

* validate the errors for all assert.throws * use arrow functions PR-URL: #10734 Backport-PR-URL: #13785 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

* use const and let instead of var * use assert.strictEqual or assert.strictDeepEqual instead of assert.equal * use arrow functions * swap assertions arguments to match the standard * validate the error for assert.throws PR-URL: #10681 Backport-PR-URL: #13785 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

makeCallback and makeStatsCallback are both tested intedependently. PR-URL: #12140 Backport-PR-URL: #13785 Fixes: #12136 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

* use arrow funcion instead of function expression * add second argument to method assert.throws * check error messages from beginning to the end using ^ and $ PR-URL: #10908 Backport-PR-URL: #13785 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Adrian Estrada <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

PR-URL: #11622 Backport-PR-URL: #13785 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]>

This adds RegExp or error constructor arguments to the remaining places where it is missing in preparation for the commit that will enforce the presence of at least two arguments. PR-URL: #12270 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>

Enables the requireTwo option of our custom rule. PR-URL: #12270 Backport-PR-URL: #13785 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>

joshholl and others added 11 commits June 19, 2017 10:27

test: improve test-buffer-includes.js

4056141

* verify error message * use arrow funcs PR-URL: nodejs#11203 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]>

test: validate errors in test-buffer-indexof

85b17c1

* validate errors in assert.throws * use arrow functions PR-URL: nodejs#10752 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

test: add regex in test_cyclic_link_protection

593553d

PR-URL: nodejs#11622 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]>

tools: enforce two arguments in assert.throws

b411cfb

Enables the requireTwo option of our custom rule. PR-URL: nodejs#12270 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>

nodejs-github-bot added tools Issues and PRs related to the tools directory. v6.x labels Jun 19, 2017

targos added the test Issues and PRs related to the tests. label Jun 19, 2017

targos mentioned this pull request Jun 19, 2017

tools: enforce two arguments in assert.throws #12270

Merged

3 tasks

gibfahn approved these changes Jun 19, 2017

View reviewed changes

gibfahn pushed a commit that referenced this pull request Jun 19, 2017

test: add regex in test_cyclic_link_protection

8032e0a

PR-URL: #11622 Backport-PR-URL: #13785 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]>

gibfahn pushed a commit that referenced this pull request Jun 20, 2017

test: add regex in test_cyclic_link_protection

bb13e25

PR-URL: #11622 Backport-PR-URL: #13785 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]>

targos added dont-land-on-v4.x labels Jun 21, 2017

MylesBorins pushed a commit that referenced this pull request Jul 11, 2017

test: add regex in test_cyclic_link_protection

eca9e72

PR-URL: #11622 Backport-PR-URL: #13785 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(v6.x backport) tools: enforce two arguments in assert.throws #13785

(v6.x backport) tools: enforce two arguments in assert.throws #13785

targos commented Jun 19, 2017

gibfahn commented Jun 19, 2017

targos commented Jun 19, 2017

gibfahn commented Jun 19, 2017

(v6.x backport) tools: enforce two arguments in assert.throws #13785

(v6.x backport) tools: enforce two arguments in assert.throws #13785

Conversation

targos commented Jun 19, 2017

Checklist

Affected core subsystem(s)

gibfahn commented Jun 19, 2017

targos commented Jun 19, 2017

gibfahn commented Jun 19, 2017