Skip to content

test: replaces fixturesDir with fixtures #15835

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
mikemfleming wants to merge 3 commits into from
Closed

test: replaces fixturesDir with fixtures #15835

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc66f9e
test: replaces fixturesDir with fixtures
Oct 6, 2017
3282e66
requires fixtures, calls readkey
Oct 11, 2017
d35adde
removes fs module, requires fixtures after crypto check
Oct 13, 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
5 changes: 3 additions & 2 deletions test/parallel/test-https-timeout.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

@gireeshpunathil gireeshpunathil Oct 13, 2017

Choose a reason for hiding this comment

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

@ mikemfleming - on a second look, I guess this require statement can move down the line, after the hasCrypto check.


if (!common.hasCrypto)
common.skip('missing crypto');
Expand All @@ -30,8 +31,8 @@ const https = require('https');
const fs = require('fs');
Copy link
Copy Markdown
Member

@gireeshpunathil gireeshpunathil Oct 13, 2017

Choose a reason for hiding this comment

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

@ mikemfleming - on a second look, the requiring of fs module is not used anywhere in the test, and I guess is likely to invite linter error. Will you remove this please?

Copy link
Copy Markdown
Author

@mikemfleming mikemfleming Oct 13, 2017

Choose a reason for hiding this comment

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

Just removed it

Copy link
Copy Markdown
Member

@gireeshpunathil gireeshpunathil Oct 14, 2017

Choose a reason for hiding this comment

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

thanks!


const options = {
key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
key: fixtures.readKey('agent1-key.pem'),
cert: fixtures.readKey('agent1-cert.pem')
};

// a server that never replies
Expand Down