Skip to content

test: update test to use fixtures #15844

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
dinophile wants to merge 5 commits into from
Closed

test: update test to use fixtures #15844

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5a085e
test: replaced common.fixturesDir with common.fixtures
dinophile Oct 6, 2017
8110afd
test: added fixtures.path() to const options
dinophile Oct 6, 2017
6dd3bb7
test: replced fixturesDir with fixtures.readKey()
dinophile Oct 10, 2017
6e84d1f
fixed waywrad characters
dinophile Oct 10, 2017
391f0f1
moved fixtures declaration to after common.hasCrypto check
dinophile Oct 11, 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
9 changes: 5 additions & 4 deletions test/parallel/test-tls-multi-key.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');

@lpinca lpinca Oct 11, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nit: would you mind moving this after the common.hasCrypto check?

@dinophile dinophile Oct 11, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Not at all! Done!

if (!common.hasCrypto)
common.skip('missing crypto');

Expand All @@ -30,12 +31,12 @@ const fs = require('fs');

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

@pawelgolda pawelgolda Oct 6, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This could be using method fixtures.readKey to get the keys.

@dinophile dinophile Oct 6, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Does it make a difference that fs.readFileSync() is platform specific (though only if the path is a directory I see...so not an issue). I've always been taught to keep it as simple as possible...so I assumed using path.join() is just a bit clearer? But live and learn! :)

@rmg rmg Oct 6, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The readFileSync(fixtures(keys...)) pattern is so common in the tests that the fixtures.readKey wrapper was created to handle it. Take a look at fixtures.readKey()!

Something like fixtures.readKey('ec-key.pem').

fs.readFileSync(fixtures.path('/keys/agent1-key.pem')),
],
cert: [
fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`),
fs.readFileSync(`${common.fixturesDir}/keys/ec-cert.pem`)
fs.readFileSync(fixtures.path('/keys/agent1-cert.pem')),
fs.readFileSync(fixtures.path('/keys/ec-cert.pem')),
]
};

Expand Down