Skip to content
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

test-tls-inception: replaced common.fixturesDir with the common.fixtures.path method #15872

Closed
wants to merge 4 commits into from
Closed

test-tls-inception: replaced common.fixturesDir with the common.fixtures.path method #15872

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e87d75b
Refactored
LancePTB Oct 6, 2017
f66f372
test-tls-inspection: removed unused path import
LancePTB Oct 6, 2017
d3388ab
test-tls-inspection: used readSync instead
LancePTB Oct 18, 2017
a31d35c
test-tls-inspection: removed unused fs import
LancePTB Oct 18, 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
6 changes: 3 additions & 3 deletions test/parallel/test-tls-inception.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');

if (!common.hasCrypto)
common.skip('missing crypto');
Expand All @@ -29,12 +30,11 @@ const assert = require('assert');
const tls = require('tls');

const fs = require('fs');
const path = require('path');
const net = require('net');

const options = {
key: fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')),
cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))
key: fs.readFileSync(fixtures.path('test_key.pem')),
cert: fs.readFileSync(fixtures.path('test_cert.pem'))
Copy link
Member

Choose a reason for hiding this comment

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

this can be:

key: fixtures.readSync('test_key.pem'),
cert: fixtures.readSync('test_cert.pem')

Copy link
Member

Choose a reason for hiding this comment

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

If there is no reaction soon, I will just change it while landing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My apologies for not following through; i pushed those changes, but i see that you have a separate branch already that had the same thing, so we could use either branch to merge.

Copy link
Member

Choose a reason for hiding this comment

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

Oh, it is still great to have the correct change in the PR! The way we merge things would result in the same right now.

};

const body = 'A'.repeat(40000);
Expand Down