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:replace common.fixturesDir with commonfixtures #15832

Closed
wants to merge 3 commits into from
Closed

test:replace common.fixturesDir with commonfixtures #15832

wants to merge 3 commits into from

Conversation

feons
Copy link
Contributor

@feons feons commented Oct 6, 2017 •
edited
Loading

Replace common.fixturesDir with usage of the common.fixtures module

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

@nodejs-github-bot nodejs-github-bot added the test Issues and PRs related to the tests. label Oct 6, 2017
rmg
rmg reviewed Oct 6, 2017
View reviewed changes
Copy link
Contributor

@rmg rmg left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution!

test/parallel/test-tls-net-connect-prefer-path.js Outdated
cert: fs.readFileSync(`${common.fixturesDir}/test_cert.pem`),
key: fs.readFileSync(`${common.fixturesDir}/test_key.pem`)
cert: fs.readFileSync(fixtures.path('test_cert.pem')),
key: fs.readFileSync(fixtures.path('test_key.pem'))
Copy link
Contributor

Choose a reason for hiding this comment

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

The fixtures module has a helper that make this even simpler! Check out fixtures.readSync().

That should let you do key: fixtures.readSync('test_key.pem') instead.

@Trott Trott added the code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. label Oct 6, 2017
@mscdex mscdex added the tls Issues and PRs related to the tls subsystem. label Oct 6, 2017
@feons
Copy link
Contributor Author

feons commented Oct 7, 2017

@rmg, updated according to your comment. Thank you!

gireeshpunathil
gireeshpunathil approved these changes Oct 10, 2017
View reviewed changes
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.

@feons - if you could remove the extra line at L34?

@gireeshpunathil
Copy link
Member

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

@feons
Copy link
Contributor Author

feons commented Oct 10, 2017

@gireeshpunathil, fixed style. Thanks!

gireeshpunathil pushed a commit that referenced this pull request Oct 11, 2017
@feons @gireeshpunathil
test:replace common.fixturesDir with commonfixtures
fc94eef 
PR-URL: #15832
Reviewed-By: Ryan Graham <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Ruben Bridgewater <[email protected]>
@gireeshpunathil
Copy link
Member

Landed in fc94eef
Thanks for the contribution!

gireeshpunathil pushed a commit that referenced this pull request Oct 11, 2017
@feons @gireeshpunathil
test:replace common.fixturesDir with commonfixtures
03550a5 
PR-URL: #15832
Reviewed-By: Ryan Graham <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>
@gireeshpunathil
Copy link
Member

Corrected the commit message and re-landed in 03550a5

@Trott
Copy link
Member

Trott commented Oct 11, 2017

Unfortunately, CI was never run on the subsequent changes (after the first CI) and this fails the linter. Is someone already on fast-tracking a fix for this?

Trott added a commit to Trott/io.js that referenced this pull request Oct 11, 2017
@Trott
test: fix lint error
281378a 
Fix lint error introduced 03550a5c1e. Unused module `fs` is removed.

Refs: nodejs#15832 (comment)
@Trott Trott mentioned this pull request Oct 11, 2017
Closed
2 tasks
@Trott
Copy link
Member

Trott commented Oct 11, 2017

Fix to minor issue in #16145

Trott added a commit to Trott/io.js that referenced this pull request Oct 11, 2017
@Trott
test: fix lint error
acb36ab 
Fix lint error introduced 03550a5c1e. Unused module `fs` is removed.

PR-URL: nodejs#16145
Ref: nodejs#15832 (comment)
Reviewed-By: Bradley Farias <[email protected]>
Reviewed-By: Refael Ackermann <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
addaleax pushed a commit to addaleax/ayo that referenced this pull request Oct 12, 2017
@feons @addaleax
test:replace common.fixturesDir with commonfixtures
66727fe 
PR-URL: nodejs/node#15832
Reviewed-By: Ryan Graham <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>
addaleax pushed a commit to addaleax/ayo that referenced this pull request Oct 12, 2017
@Trott @addaleax
test: fix lint error
98e3b6d 
Fix lint error introduced 03550a5c1e. Unused module `fs` is removed.

PR-URL: nodejs/node#16145
Ref: nodejs/node#15832 (comment)
Reviewed-By: Bradley Farias <[email protected]>
Reviewed-By: Refael Ackermann <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@gireeshpunathil
Copy link
Member

@Trott - probably I overlooked at the CI. Thanks for addressing it!

targos pushed a commit that referenced this pull request Oct 18, 2017
@feons @targos
test:replace common.fixturesDir with commonfixtures
ceca43b 
PR-URL: #15832
Reviewed-By: Ryan Graham <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>
targos pushed a commit that referenced this pull request Oct 18, 2017
@Trott @targos
test: fix lint error
0e2db0e 
Fix lint error introduced 03550a5c1e. Unused module `fs` is removed.

PR-URL: #16145
Ref: #15832 (comment)
Reviewed-By: Bradley Farias <[email protected]>
Reviewed-By: Refael Ackermann <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rmg rmg rmg left review comments

@jasnell jasnell jasnell approved these changes

@cjihrig cjihrig cjihrig approved these changes

@tniessen tniessen tniessen approved these changes

@gireeshpunathil gireeshpunathil gireeshpunathil approved these changes

@BridgeAR BridgeAR BridgeAR approved these changes

Assignees
No one assigned
Labels
code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. test Issues and PRs related to the tests. tls Issues and PRs related to the tls subsystem.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.