Skip to content

test: change to common fixtures module in test file #15886

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
bobclewell wants to merge 2 commits into from
Closed

test: change to common fixtures module in test file #15886

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0bc9b2
test: change to common fixtures module in test file
Oct 6, 2017
e1089e2
test: Updated test to use readKey rather than fixturesDir
Oct 9, 2017
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
Next Next commit
test: change to common fixtures module in test file 
Task to replace the common.fixturesDir with the usage
of the common.fixtures module. At Node.js Interactive.
First PR to Node.js. Yay!
  • Loading branch information
Bob Clewell committed Oct 6, 2017
commit a0bc9b217f746749b7457c9b89910d9edccdeb64
5 changes: 3 additions & 2 deletions test/parallel/test-https-set-timeout-server.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 fixtures = require('../common/fixtures');
Copy link
Copy Markdown
Member

@lpinca lpinca Oct 10, 2017

Choose a reason for hiding this comment

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

Nit: can you please move this after the common.hasCrypto check?

Copy link
Copy Markdown
Author

@bobclewell bobclewell Oct 10, 2017

Choose a reason for hiding this comment

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

Done.


if (!common.hasCrypto)
common.skip('missing crypto');
Expand All @@ -34,8 +35,8 @@ const tls = require('tls');
const tests = [];

const serverOptions = {
key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
key: fs.readFileSync(`${fixtures.fixturesDir}/keys/agent1-key.pem`),
cert: fs.readFileSync(`${fixtures.fixturesDir}/keys/agent1-cert.pem`)
Copy link
Copy Markdown
Member

@BridgeAR BridgeAR Oct 9, 2017

Choose a reason for hiding this comment

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

There is a dedicated fixtures.readKey function that should be used here. In that case the line is much shorter and you only have to provide the file name.

Copy link
Copy Markdown
Author

@bobclewell bobclewell Oct 9, 2017

Choose a reason for hiding this comment

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

@BridgeAR, so for example?

key: fixtures.readKey(`agent1-key.pem`),

};

function test(fn) {
Expand Down