Skip to content

test: common.fixturesDir --> common.fixtures #15976

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

test: common.fixturesDir --> common.fixtures #15976

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11515ec
Merge remote-tracking branch 'nodejs/master'
Jan 24, 2017
6fe647a
Merge remote-tracking branch 'nodejs/master'
Feb 3, 2017
7feb0db
Merge remote-tracking branch 'nodejs/master'
Oct 6, 2017
778fbdd
test: common.fixturesDir --> common.fixtures
Oct 6, 2017
0414bce
Update test-tls-delayed-attach.js
camantigue Oct 20, 2017
15579d4
Used Fixtures's readKey instead of readSync
camantigue Oct 20, 2017
c21f0b2
Removed /keys/ for key file path
camantigue Oct 20, 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
7 changes: 4 additions & 3 deletions test/parallel/test-tls-delayed-attach.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,18 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');


Copy link
Member

@BridgeAR BridgeAR Oct 7, 2017

Choose a reason for hiding this comment

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

Nit - it would be nice not to have any unrelated changes and if this could be changed back again.

const fixtures = require('../common/fixtures');
const assert = require('assert');
const tls = require('tls');
const fs = require('fs');
const net = require('net');

const sent = 'hello world';
let received = '';

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

@pawelgolda pawelgolda Oct 6, 2017

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 instead to get the keys.

cert: fixtures.readSync('/keys/agent1-cert.pem')
};

const server = net.createServer(function(c) {
Expand Down