Skip to content
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

Jump to bottom

test: add unexpected value to dgram socket type assertion #18449

Closed
wants to merge 1 commit into from
Closed

test: add unexpected value to dgram socket type assertion #18449

wants to merge 1 commit into from

Conversation

kcaulfield94
Copy link
Contributor

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

test/dgram

@nodejs-github-bot nodejs-github-bot added the test Issues and PRs related to the tests. label Jan 30, 2018
lpinca
lpinca reviewed Jan 30, 2018
View reviewed changes
test/parallel/test-dgram-createSocket-type.js Outdated
@@ -52,10 +52,10 @@ validTypes.forEach((validType) => {
// note: linux will double the buffer size
assert.ok(socket.getRecvBufferSize() === 10000 ||
socket.getRecvBufferSize() === 20000,
'SO_RCVBUF not 1300 or 2600');
`SO_RCVBUF not 1300 or 2600, was ${socket.getRecvBufferSize()}`);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit confused. Why the message says "1300 or 2600" when the value should be 10000 or 20000?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lpinca I will update accordingly, unless anyone knows why these values were in place to begin with. Seems to have come from #13623.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add that change? :-) I guess otherwise the PR would be ready to land.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutely, will be added shortly! Thanks!

@kcaulfield94
Copy link
Contributor Author

I apologise. Embarrassingly, something seems to have gone wrong with my first Node contribution. Any suggestions?

@bnoordhuis
Copy link
Member

@kcaulfield94 git fetch origin && git rebase origin/master, then force-push to your feature branch. After that you should have a branch that's master + your commit on top.

@kcaulfield94
Copy link
Contributor Author

@bnoordhuis thanks for being so kind. Will update shortly.

@bnoordhuis
Copy link
Member

bnoordhuis commented Feb 2, 2018 •
edited
Loading

@kcaulfield94 Alternative approach: git reset --hard origin/master && git cherry-pick <your commit's hash>, then force-push again. You should be able to find it with git reflog.

edit: I see it's the last commit here, kcaulfield94/node@f390eb4. If all else fails, I can probably fix it up for you.

edit2: I just tried, I can't. Did you disallow edits from collaborators? You can pick from https://github.com/bnoordhuis/io.js/tree/pr18449 if you want.

@BridgeAR
Copy link
Member

BridgeAR commented Feb 6, 2018

Ping @kcaulfield94

BridgeAR
BridgeAR approved these changes Feb 10, 2018
View reviewed changes
test/parallel/test-dgram-createSocket-type.js
@@ -52,10 +52,12 @@ validTypes.forEach((validType) => {
// note: linux will double the buffer size
assert.ok(socket.getRecvBufferSize() === 10000 ||
socket.getRecvBufferSize() === 20000,
'SO_RCVBUF not 1300 or 2600');
'SO_RCVBUF not 10000 or 20000, ' +
`was ${socket.getRecvBufferSize()}`);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non blocking nit: please indent this code two more so it is possible to distinguish it from the other lines. The same applies to the part below.

@BridgeAR BridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Feb 10, 2018
@BridgeAR
Copy link
Member

Light-CI https://ci.nodejs.org/job/node-test-commit-light/253/

BridgeAR pushed a commit to BridgeAR/node that referenced this pull request Feb 12, 2018
@kcaulfield94 @BridgeAR
test: fix and improve error message
18e7284 
Add unexpected value to dgram socket type assertion and fix the size
entry.

PR-URL: nodejs#18449
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
@BridgeAR
Copy link
Member

Landed in 18e7284 🎉

@kcaulfield94 congratulation on your first commit to Node.js!

@BridgeAR BridgeAR closed this Feb 12, 2018
MylesBorins pushed a commit that referenced this pull request Feb 21, 2018
@kcaulfield94 @MylesBorins
test: fix and improve error message
d40e90a 
Add unexpected value to dgram socket type assertion and fix the size
entry.

PR-URL: #18449
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
MylesBorins pushed a commit that referenced this pull request Feb 21, 2018
@kcaulfield94 @MylesBorins
test: fix and improve error message
bd2edd7 
Add unexpected value to dgram socket type assertion and fix the size
entry.

PR-URL: #18449
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
@MylesBorins MylesBorins mentioned this pull request Feb 21, 2018
Merged
MylesBorins pushed a commit that referenced this pull request Feb 21, 2018
@kcaulfield94 @MylesBorins
test: fix and improve error message
3362ae7 
Add unexpected value to dgram socket type assertion and fix the size
entry.

PR-URL: #18449
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
MayaLekova pushed a commit to MayaLekova/node that referenced this pull request May 8, 2018
@kcaulfield94 @MayaLekova
test: fix and improve error message
042213f 
Add unexpected value to dgram socket type assertion and fix the size
entry.

PR-URL: nodejs#18449
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
MylesBorins pushed a commit that referenced this pull request Aug 7, 2018
@kcaulfield94 @MylesBorins
test: fix and improve error message
edccc9f 
Add unexpected value to dgram socket type assertion and fix the size
entry.

PR-URL: #18449
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
rvagg pushed a commit that referenced this pull request Aug 16, 2018
@kcaulfield94 @rvagg
test: fix and improve error message
bbc7443 
Add unexpected value to dgram socket type assertion and fix the size
entry.

PR-URL: #18449
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
@MylesBorins MylesBorins mentioned this pull request Aug 16, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lpinca lpinca lpinca left review comments

@BridgeAR BridgeAR BridgeAR approved these changes

@cjihrig cjihrig cjihrig approved these changes

@addaleax addaleax addaleax approved these changes

Assignees
No one assigned
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. test Issues and PRs related to the tests.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@kcaulfield94 @bnoordhuis @BridgeAR @addaleax @lpinca @cjihrig @MylesBorins @nodejs-github-bot