test: replace common.fixturesDir with the fixtures module #16027
Closed
weiplanet wants to merge 1 commit intonodejs:masterfrom
Closed
test: replace common.fixturesDir with the fixtures module #16027weiplanet wants to merge 1 commit intonodejs:masterfrom
weiplanet wants to merge 1 commit intonodejs:masterfrom
Conversation
BridgeAR
approved these changes
Oct 6, 2017
benjamingr
reviewed
Oct 7, 2017
| const fs = require('fs'); | ||
| const path = require('path'); | ||
| const fixtures = path.join(common.fixturesDir, 'keys'); | ||
| const fixtures = path.join(fixturesModule.fixturesDir, 'keys'); |
Member
There was a problem hiding this comment.
This can be a fixures.path('keys')
Contributor
There was a problem hiding this comment.
I think a better change would be to update the fs.readFileSync() calls a few lines later to use the fixture keys call.
Member
There was a problem hiding this comment.
For instance...
const options = {
key: fixtures.readSync('agent1-key.pem'),
cert: fixtures.readSync('agent1-cert.pem')
};
benjamingr
approved these changes
Oct 7, 2017
Member
lpinca
approved these changes
Oct 14, 2017
|
|
||
| 'use strict'; | ||
| const common = require('../common'); | ||
| const fixturesModule = require('../common/fixtures'); |
Member
There was a problem hiding this comment.
Nit: this could/should be moved after the common.hasCrypto check.
hiroppy
approved these changes
Oct 14, 2017
Member
|
Landed in 1a9f48a with #16027 (review) and #16027 (review) fixed. Thank you for the contribution! |
joyeecheung
pushed a commit
that referenced
this pull request
Oct 14, 2017
PR-URL: #16027 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
addaleax
pushed a commit
to ayojs/ayo
that referenced
this pull request
Oct 15, 2017
PR-URL: nodejs/node#16027 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
targos
pushed a commit
that referenced
this pull request
Oct 18, 2017
PR-URL: #16027 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
MylesBorins
pushed a commit
that referenced
this pull request
Nov 16, 2017
PR-URL: #16027 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Merged
MylesBorins
pushed a commit
that referenced
this pull request
Nov 21, 2017
PR-URL: #16027 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
MylesBorins
pushed a commit
that referenced
this pull request
Nov 28, 2017
PR-URL: #16027 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
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.
Replace common.fixturesDir with use of the common.fixtures module
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesSubsystem
test