Skip to content

test: replace common.fixturesDir with the fixtures module #16027

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

Closed
weiplanet wants to merge 1 commit into from
Closed

test: replace common.fixturesDir with the fixtures module #16027

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion test/parallel/test-http-default-port.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

'use strict';
const common = require('../common');
const fixturesModule = require('../common/fixtures');
Copy link
Member

@lpinca lpinca Oct 14, 2017

Choose a reason for hiding this comment

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

Nit: this could/should be moved after the common.hasCrypto check.


if (!common.hasCrypto)
common.skip('missing crypto');
Expand All @@ -31,7 +32,7 @@ const assert = require('assert');
const hostExpect = 'localhost';
const fs = require('fs');
const path = require('path');
const fixtures = path.join(common.fixturesDir, 'keys');
const fixtures = path.join(fixturesModule.fixturesDir, 'keys');
Copy link
Member

@benjamingr benjamingr Oct 7, 2017

Choose a reason for hiding this comment

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

This can be a fixures.path('keys')

Copy link
Contributor

@cjihrig cjihrig Oct 7, 2017

Choose a reason for hiding this comment

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

I think a better change would be to update the fs.readFileSync() calls a few lines later to use the fixture keys call.

Copy link
Member

@jasnell jasnell Oct 10, 2017

Choose a reason for hiding this comment

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

For instance...

const options = {
  key: fixtures.readSync('agent1-key.pem'),
  cert: fixtures.readSync('agent1-cert.pem')
};

const options = {
key: fs.readFileSync(`${fixtures}/agent1-key.pem`),
cert: fs.readFileSync(`${fixtures}/agent1-cert.pem`)
Expand Down