test: add RegExp second argument to assert.throws

[dave-k]

Add a regular expression argument to assert.throws(Function, RegExp)
in test/addons/make-callback-recurse/test.js.

Checklist

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

Affected core subsystem(s)

[Trott]

LGTM if CI is green

[Trott]

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

[Trott]

@dave-k You checked the box indicating that your commit message follows the commit guidelines, but it does not. (Looks like you edited the PR message to follow the guidelines.)

If you can fix it and force-push to your branch, then awesome. (If not, that's OK too because whoever lands this can do it at that time.)

[dave-k]

Hi, I would be happy to fix it. Could you explain what is required to fix the commit message so that it follows the commit guidelines.

…

On Thu, Mar 30, 2017 at 1:46 PM, Rich Trott ***@***.***> wrote: @dave-k <https://github.com/dave-k> You checked the box indicating that your commit message follows the commit guidelines, but it does not. (Looks like you edited the PR message to follow the guidelines.) If you can fix it and force-push to your branch, then awesome. (If not, that's OK too because whoever lands this can do it at that time.) — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#12139 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AFMfPMYhnCzssrckAcRCsck4rBar20sEks5rrBSggaJpZM4Mu4Ao> .

[vsemozhetbyt]

@dave-k According to commit guidelines, you could:

• Begin the commit title (the first message line) with subsystem prefix (test: ) like in the PR title.
• Use lower case imperative verb after the subsystem prefix (test: add...) like in the PR title.
• Insert an empty line after commit title.

So the whole commit message could be:

test: add a second argument to assert.throws()

- a regular expression that matches the entire error message.

[jasnell]

@dave-k ... can you please rebase the commits to get rid of the merge commit?

[dave-k]

@jasnell

do you mean to run?
$ git rebase origin/master

[aqrln]

@dave-k I believe you'll need to rebase onto upstream/master since your origin/master already contains the junk merge commit. Moreover, I see that you have two identical commits with different commit messages in your master branch (looks like you have done git pull && git push instead of git push -f).

I'd recommend you to do the following:

$ git remote add upstream https://github.com/nodejs/node.git

if you haven't done that yet, and then

$ git fetch upstream
$ git rebase -i upstream/master

Your default text editor will appear (most probably that'll be nano or vi/vim; feel free to ping me if that's the latter and you need any help with using it or with changing the default editor). Change pick to drop for your old commit, and change pick to reword for your new commit since its message has a typo in it (a missing space between two words), save and exit. Then the editor will open once again with the commit message of your new commit. Fix the typo, save and exit. And the last step:

$ git push -f

This way you'll be fine with this PR, but be sure to create new branches for all of your new patches, never open PRs from master. You'll probably need to do

$ git fetch upstream
$ git reset --hard upstream/master

when this PR lands.

[aqrln]

@jasnell just notifying you that @dave-k has successfully rebased their commit in case you're waiting for it to land the PR.

@dave-k for your future contributions, take a look at https://github.com/nodejs/node/blob/master/CONTRIBUTING.md for the commit guidelines and Git recipes related to a PR's lifecycle, and happy hacking ;)

[jasnell]

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

[vsemozhetbyt]

Landed in 943d085
Thank you, @dave-k!