test: In test/parallel/test-https-drain.js, use fixtures.fixturesDir #15841
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
szhangpitt
changed the title
There is already a function that does the path.join() with fixturesDir. So this commit just uses that.
rmg
reviewed
Oct 6, 2017
test/parallel/test-https-drain.js
Outdated
|
|
||
| const options = { | ||
| key: fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')), | ||
| cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem')) | ||
| key: fs.readFileSync(fixtures.path('test_key.pem')), |
There was a problem hiding this comment.
This could be cleaned up further by making use of fixtures.readSync() to replace the fs.readFileSync and the path.join!
Something like key: fixtures.readSync('test_key.pem'),
Trott
added
the
code-and-learn
|
@szhangpitt if you could push another commit to your branch that makes the change @rmg suggested that'd be ideal. |
|
Thanks for the suggestion! will push another commit soon. |
Based on @rmg suggestion, use fixtures.path() in place of fs.readFileSync()
addaleax
approved these changes
Oct 10, 2017
gireeshpunathil
approved these changes
Oct 10, 2017
lpinca
approved these changes
Oct 11, 2017
| @@ -21,17 +21,17 @@ | |||
|
|
|||
| 'use strict'; | |||
| const common = require('../common'); | |||
| const fixtures = require('../common/fixtures'); | |||
There was a problem hiding this comment.
Nit: can you please move this after the common.hasCrypto check?
|
Landed in 84f6964 with #15841 (review) fixed. Thanks! |
joyeecheung
pushed a commit
that referenced
this pull request
Oct 13, 2017
PR-URL: #15841 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
addaleax
pushed a commit
to ayojs/ayo
that referenced
this pull request
Oct 15, 2017
PR-URL: nodejs/node#15841 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
targos
pushed a commit
that referenced
this pull request
Oct 18, 2017
PR-URL: #15841 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
MylesBorins
pushed a commit
that referenced
this pull request
Nov 16, 2017
PR-URL: #15841 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
MylesBorins
pushed a commit
that referenced
this pull request
Nov 21, 2017
PR-URL: #15841 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
MylesBorins
pushed a commit
that referenced
this pull request
Nov 28, 2017
PR-URL: #15841 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a task at Node.js Interactive 2017 Code & Learn. The task reads:
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)