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.

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

test: remove AIX guard in fs-options-immutable #12687

Conversation

thefourtheye
Copy link
Contributor

The fs watch test was not run on AIX till now because of the known
issue, #5085. Now that it is
completed, this guard can be removed.

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

fs aix test


@nodejs/platform-aix

@thefourtheye thefourtheye added aix Issues and PRs related to the AIX platform. fs Issues and PRs related to the fs subsystem / file system. test Issues and PRs related to the tests. labels Apr 27, 2017
@nodejs-github-bot nodejs-github-bot added the test Issues and PRs related to the tests. label Apr 27, 2017
@thefourtheye
Copy link
Contributor Author

if (!common.isAix) {
// TODO(thefourtheye) Remove this guard once
// https://github.com/nodejs/node/issues/5085 is fixed
{
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we just get rid of this start brace and its matching end brace and re-indent the enclosed code?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All the other tests also have this block thing. I thought it would be consistent. If you want to remove it, I can do it.

Copy link
Contributor

@mscdex mscdex Apr 27, 2017

Choose a reason for hiding this comment

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

Well IMHO it's excessive since it doesn't (directly) provide scoping for any variables (or any code for that matter). I don't know how everyone else feels about it.

Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't removing the outer block still be consistent with the rest of the test because everything inside that block scope is itself block-scoped? So you'd end up with this block-scoped code?:

{
  let watch;
  assert.doesNotThrow(() => {
    watch = fs.watch(__filename, options, common.noop);
  });
  watch.close();
}

{
  assert.doesNotThrow(() => fs.watchFile(__filename, options, common.noop));
  fs.unwatchFile(__filename);
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh yeah, makes sense. Removed that block now...

The fs watch test was not run on AIX till now because of the known
issue, nodejs#5085. Now that it is
completed, this guard can be removed.
@thefourtheye thefourtheye force-pushed the make-fs-options-immutable-available-on-aix branch from c54f8a5 to aafd390 Compare April 27, 2017 09:01
@thefourtheye
Copy link
Contributor Author

CI Run: https://ci.nodejs.org/job/node-test-pull-request/7700/ (after removing the block)

@mscdex
Copy link
Contributor

mscdex commented Apr 27, 2017

LGTM

@gibfahn
Copy link
Member

gibfahn commented Apr 27, 2017

LGTM but I'd appreciate a review from @gireeshpunathil

Copy link
Member

@gireeshpunathil gireeshpunathil left a comment

Choose a reason for hiding this comment

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

Changes look good to me, thanks!

Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

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

LGTM

@mhdawson
Copy link
Member

@gibfahn
Copy link
Member

gibfahn commented Apr 28, 2017

Landed in b16869c , thanks @thefourtheye !

@gibfahn gibfahn closed this Apr 28, 2017
gibfahn pushed a commit that referenced this pull request Apr 28, 2017
The fs watch test was not run on AIX till now because of the known
issue, #5085. Now that it is
completed, this guard can be removed.

PR-URL: #12687
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
@thefourtheye thefourtheye deleted the make-fs-options-immutable-available-on-aix branch April 30, 2017 10:59
@jasnell jasnell mentioned this pull request May 11, 2017
@gibfahn gibfahn mentioned this pull request Jun 15, 2017
3 tasks
@gibfahn
Copy link
Member

gibfahn commented Jun 18, 2017

Depends on #7831 which is dont-land.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
aix Issues and PRs related to the AIX platform. fs Issues and PRs related to the fs subsystem / file system. test Issues and PRs related to the tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants