test: add a RegExp #10058

zjyw · 2016-12-01T18:23:27Z

Checklist

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

Affected core subsystem(s)

test

Description of change

Add a RegExp as a second argument to assert.throws().

drifkin · 2016-12-01T19:20:06Z

test/parallel/test-dns-regress-7070.js

@@ -4,5 +4,7 @@ const assert = require('assert');
 const dns = require('dns');

 // Should not raise assertion error. Issue #7070
-assert.throws(() => dns.resolveNs([])); // bad name
-assert.throws(() => dns.resolveNs('')); // bad callback
+//assert.throws(() => dns.resolveNs([]), /^\"name\" argument must be a string$/); // bad name


I think this line was committed by accident?

Yes. Thanks for catching it. Now it is fixed.

addaleax · 2016-12-02T22:34:15Z

test/parallel/test-dns-regress-7070.js

-assert.throws(() => dns.resolveNs([])); // bad name
-assert.throws(() => dns.resolveNs('')); // bad callback
+assert.throws(() => dns.resolveNs([]), /"name" argument must be a string/); // bad name
+assert.throws(() => dns.resolveNs(''), /"callback" argument must be a function/); // bad callback


These lines are longer than 80 characters, which is something we want to avoid – could you move the second argument to a new line (and align that below the first argument)?

If you're checking the entire error message, you can add ^ and $ to the regular expression as well.

zjyw · 2016-12-06T17:15:32Z

thanks for the suggestions. made the changes.

jasnell

The changes LGTM but the commits should be squashed and a bit more descriptive.. for instance:

test: test error messages in test-dns-regress-7070.js

cjihrig · 2016-12-06T22:13:51Z

test/parallel/test-dns-regress-7070.js

@@ -4,5 +4,14 @@ const assert = require('assert');
 const dns = require('dns');

 // Should not raise assertion error. Issue #7070
-assert.throws(() => dns.resolveNs([])); // bad name
-assert.throws(() => dns.resolveNs('')); // bad callback
+<<<<<<< HEAD


Looks like some merge conflicts got through.

zjyw · 2016-12-06T22:18:47Z

It took me several commits to get it right. I think it should be good now. Let me know if there is anything else I need to change.

lpinca · 2016-12-11T21:00:27Z

test/parallel/test-dns-regress-7070.js

+assert.throws(() => dns.resolveNs([]), // bad name
+              /^Error: "name" argument must be a string$/); 
+assert.throws(() => dns.resolveNs(''), // bad callback
+              /^Error: "callback" argument must be a function$/);


@zjyw can you please add a final new line? The linter will fail without it.

yeah. just added it. thanks for pointing it out. i was wondering about it after my last commit.

Fishrock123 · 2016-12-12T22:32:30Z

dont-land-on-v7.x seems correct here. - nodejs/github-bot#100

lpinca · 2016-12-16T13:38:07Z

@Fishrock123 why this shouldn't land on v7.x ?

lpinca · 2016-12-16T13:38:29Z

@addaleax LGTY?

targos · 2016-12-16T14:28:42Z

@lpinca The changes don't apply cleanly (even on master)

lpinca · 2016-12-16T14:38:15Z

@targos I see, the green merge button tricked me, thanks.

zjyw · 2016-12-16T15:06:29Z

@targos I am new to the node.js change system. When you say it won't apply cleanly, do you mean the unit test will fail or something else?

gibfahn · 2016-12-16T15:19:23Z

@zjyw He means that there are merge conflicts when he tried to apply this PR as a series of patches (as described here). If you rebase against master it should fix the issues.

addaleax

yes, lgtm!

lpinca · 2016-12-16T16:16:15Z

@zjyw if you could rebase this PR against master and optionally squash your commits that would be awesome.

Fishrock123 · 2016-12-16T16:31:12Z

Next time please try to do a backport before removing the label, thanks.

This does not apply cleanly on v7.x

targos · 2016-12-16T18:46:54Z

@Fishrock123 I tried and it does apply cleanly if the commits are squashed.
Maybe I don't understand correctly the purpose of the dont-land-on- labels. What I read is "do not land", as an imperative mood. When I put the label on a PR, it is to indicate that the commit should not go into that branch, even if it applies cleanly.

zjyw · 2016-12-18T18:26:53Z

Rebased and squashed using 'git rebase -i HEAD~7'. Let me know if I did it right.

Add a RegExp as a second argument to assert.throws().

targos · 2016-12-19T07:30:50Z

@zjyw it seems something went wrong. I went ahead and fixed it. Here is what I did, with the upstream remote pointing to this repo (nodejs/node):

git fetch upstream
git rebase -i upstream/master
Pick the first commit and squash the others:
Fix the conflicts (just always kept the HEAD part) until the rebase is done.
make test to check everything is fine
git push --force-with-lease zjyw HEAD:master

targos · 2016-12-19T07:32:31Z

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

zjyw · 2016-12-19T19:04:04Z

@targos thanks for help!

Trott · 2016-12-22T04:45:37Z

CI failure on FreeBSD seems entirely unrelated to this change, but just to be sure...

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

Add a RegExp as a second argument to assert.throws(). PR-URL: nodejs#10058 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>

Trott · 2016-12-24T01:20:17Z

Landed in be6de1a.
Thanks for the contribution! 🎉

Add a RegExp as a second argument to assert.throws(). PR-URL: #10058 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>

nodejs-github-bot added the test Issues and PRs related to the tests. label Dec 1, 2016

imyller added the code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. label Dec 1, 2016

drifkin reviewed Dec 1, 2016

View reviewed changes

addaleax requested changes Dec 2, 2016

View reviewed changes

jasnell approved these changes Dec 6, 2016

View reviewed changes

cjihrig approved these changes Dec 6, 2016

View reviewed changes

cjihrig reviewed Dec 6, 2016

View reviewed changes

lpinca reviewed Dec 11, 2016

View reviewed changes

nodejs-github-bot added the dont-land-on-v7.x label Dec 11, 2016

lpinca approved these changes Dec 12, 2016

View reviewed changes

targos removed the dont-land-on-v7.x label Dec 16, 2016

addaleax approved these changes Dec 16, 2016

View reviewed changes

Fishrock123 added the dont-land-on-v7.x label Dec 16, 2016

nodejs-github-bot added the dont-land-on-v7.x label Dec 18, 2016

test: test error messages in test-dns-regress-7070

ccf4b3c

Add a RegExp as a second argument to assert.throws().

nodejs-github-bot added the lts-watch-v6.x label Dec 19, 2016

gibfahn mentioned this pull request Dec 19, 2016

Clarify dont-land-on labels #10336

Closed

targos removed the dont-land-on-v7.x label Dec 19, 2016

Trott closed this Dec 24, 2016

targos added land-on-v6.x and removed lts-watch-v6.x labels Dec 26, 2016

MylesBorins mentioned this pull request Dec 27, 2016

V6.9.3 proposal #10394

Merged

evanlucas mentioned this pull request Jan 3, 2017

v7.4.0 release proposal #10589

Merged

MylesBorins added dont-land-on-v4.x and removed lts-watch-v4.x labels Jan 23, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: add a RegExp #10058

test: add a RegExp #10058

zjyw commented Dec 1, 2016 •

edited

Loading

drifkin Dec 1, 2016

zjyw Dec 1, 2016

addaleax Dec 2, 2016

cjihrig Dec 3, 2016

zjyw commented Dec 6, 2016

jasnell left a comment

cjihrig Dec 6, 2016

zjyw commented Dec 6, 2016

lpinca Dec 11, 2016

zjyw Dec 11, 2016

Fishrock123 commented Dec 12, 2016

lpinca commented Dec 16, 2016

lpinca commented Dec 16, 2016

targos commented Dec 16, 2016

lpinca commented Dec 16, 2016 •

edited

Loading

zjyw commented Dec 16, 2016

gibfahn commented Dec 16, 2016 •

edited

Loading

addaleax left a comment

lpinca commented Dec 16, 2016

Fishrock123 commented Dec 16, 2016

targos commented Dec 16, 2016

zjyw commented Dec 18, 2016

targos commented Dec 19, 2016

targos commented Dec 19, 2016

zjyw commented Dec 19, 2016

Trott commented Dec 22, 2016

Trott commented Dec 24, 2016

test: add a RegExp #10058

test: add a RegExp #10058

Conversation

zjyw commented Dec 1, 2016 • edited Loading

Checklist

Affected core subsystem(s)

Description of change

drifkin Dec 1, 2016

Choose a reason for hiding this comment

zjyw Dec 1, 2016

Choose a reason for hiding this comment

addaleax Dec 2, 2016

Choose a reason for hiding this comment

cjihrig Dec 3, 2016

Choose a reason for hiding this comment

zjyw commented Dec 6, 2016

jasnell left a comment

Choose a reason for hiding this comment

cjihrig Dec 6, 2016

Choose a reason for hiding this comment

zjyw commented Dec 6, 2016

lpinca Dec 11, 2016

Choose a reason for hiding this comment

zjyw Dec 11, 2016

Choose a reason for hiding this comment

Fishrock123 commented Dec 12, 2016

lpinca commented Dec 16, 2016

lpinca commented Dec 16, 2016

targos commented Dec 16, 2016

lpinca commented Dec 16, 2016 • edited Loading

zjyw commented Dec 16, 2016

gibfahn commented Dec 16, 2016 • edited Loading

addaleax left a comment

Choose a reason for hiding this comment

lpinca commented Dec 16, 2016

Fishrock123 commented Dec 16, 2016

targos commented Dec 16, 2016

zjyw commented Dec 18, 2016

targos commented Dec 19, 2016

targos commented Dec 19, 2016

zjyw commented Dec 19, 2016

Trott commented Dec 22, 2016

Trott commented Dec 24, 2016

zjyw commented Dec 1, 2016 •

edited

Loading

lpinca commented Dec 16, 2016 •

edited

Loading

gibfahn commented Dec 16, 2016 •

edited

Loading