Skip to content

test: switch to use common.fixtures.readKey #15814

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

test: switch to use common.fixtures.readKey #15814

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b088b1
test: switch to use common.fixtures.fixturesDir
UnrememberMe Oct 6, 2017
0437fd4
Remove intermediate calls and use fixtures.readKey directly.
UnrememberMe Oct 6, 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
3 changes: 2 additions & 1 deletion test/parallel/test-https-strict.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 9, 2017 •
edited
Loading

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?

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

Expand All @@ -33,7 +34,7 @@ const fs = require('fs');
const path = require('path');

function file(fname) {
return path.resolve(common.fixturesDir, 'keys', fname);
return path.resolve(fixtures.fixturesDir, 'keys', fname);
Copy link
Copy Markdown
Contributor

@rmg rmg Oct 6, 2017

Choose a reason for hiding this comment

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

It looks like the path.resolve() itself could be replaced by fixtures.path('keys', fname).

Copy link
Copy Markdown
Contributor

@rmg rmg Oct 6, 2017

Choose a reason for hiding this comment

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

Actually, it looks like the file() wrapper is only used by read(), which is only being used for keys. The read('agent1-key.pem') calls below can probably be replaced directly with fixtures.readKey('agent1-key.pem').

Copy link
Copy Markdown
Contributor Author

@UnrememberMe UnrememberMe Oct 6, 2017

Choose a reason for hiding this comment

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

Done.

}

function read(fname) {
Expand Down