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: fs.write() if 3rd argument is a callback, not offset #17045

Closed
wants to merge 3 commits into from
Closed

test: fs.write() if 3rd argument is a callback, not offset #17045

wants to merge 3 commits into from

Conversation

PatrickHeneise
Copy link

#16827 and #16822 resulted in some serious merge conflicts, so I decided to open a fresh PR for this with everything resolved.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

@nodejs-github-bot nodejs-github-bot added the test Issues and PRs related to the tests. label Nov 15, 2017
@PatrickHeneise PatrickHeneise mentioned this pull request Nov 15, 2017
Closed
3 tasks
@mscdex mscdex added the fs Issues and PRs related to the fs subsystem / file system. label Nov 15, 2017
cjihrig
cjihrig reviewed Nov 16, 2017
View reviewed changes
test/parallel/test-fs-write.js Outdated
@@ -73,3 +73,13 @@ fs.open(fn2, args, 0o644, common.mustCall((err, fd) => {
fs.write(fd, '', 0, 'utf8', written);
fs.write(fd, expected, 0, 'utf8', done);
}));

fs.open(fn, 'w', 0o644, common.mustCall(function(err, fd) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd use something other than fn to prevent any issues with the tests interacting with one another.

Copy link
Author

Choose a reason for hiding this comment

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

Done, thanks.

jasnell
jasnell reviewed Nov 16, 2017
View reviewed changes
Copy link
Member

@jasnell jasnell left a comment

Choose a reason for hiding this comment

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

LGTM with @cjihrig's comment addressed

@addaleax
Copy link
Member

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

This should be ready.

@addaleax addaleax added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Nov 18, 2017
@addaleax
Copy link
Member

Landed in 8f8999c, thanks for the PR! ✨

@addaleax addaleax closed this Nov 18, 2017
addaleax pushed a commit that referenced this pull request Nov 18, 2017
@addaleax
test: fs.write() if 3rd argument is a callback, not offset
8f8999c 
Easier way to resolve conflicts from #16822 and #16827.

PR-URL: #17045
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
@Trott Trott removed the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Nov 18, 2017
@PatrickHeneise PatrickHeneise deleted the cov-fs-2 branch November 18, 2017 21:52
MylesBorins pushed a commit that referenced this pull request Dec 12, 2017
@MylesBorins
test: fs.write() if 3rd argument is a callback, not offset
79ba863 
Easier way to resolve conflicts from #16822 and #16827.

PR-URL: #17045
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
@MylesBorins MylesBorins mentioned this pull request Dec 12, 2017
Merged
gibfahn pushed a commit that referenced this pull request Dec 19, 2017
@gibfahn
test: fs.write() if 3rd argument is a callback, not offset
c01d934 
Easier way to resolve conflicts from #16822 and #16827.

PR-URL: #17045
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
@gibfahn gibfahn mentioned this pull request Dec 20, 2017
Closed
gibfahn pushed a commit that referenced this pull request Dec 20, 2017
@gibfahn
test: fs.write() if 3rd argument is a callback, not offset
2f276c8 
Easier way to resolve conflicts from #16822 and #16827.

PR-URL: #17045
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
@gibfahn gibfahn mentioned this pull request Dec 20, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasnell jasnell jasnell left review comments

@cjihrig cjihrig cjihrig approved these changes

@addaleax addaleax addaleax approved these changes

Assignees
No one assigned
Labels
fs Issues and PRs related to the fs subsystem / file system. test Issues and PRs related to the tests.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@PatrickHeneise @addaleax @jasnell @cjihrig @mscdex @MylesBorins @Trott @gibfahn @nodejs-github-bot