Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 92b29cd

Browse filesBrowse files
TrottMylesBorins
authored andcommitted
test: remove common.fixturesDir from tests
Use common/fixtures module instead of common.fixturesDir. PR-URL: #17400 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Jon Moss <me@jonathanmoss.me> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Lance Ball <lball@redhat.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent 23967b2 commit 92b29cd
Copy full SHA for 92b29cd

File tree

Expand file treeCollapse file tree

2 files changed

+8
-9
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+8
-9
lines changed
Open diff view settings
Collapse file

‎test/parallel/test-tls-interleave.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-tls-interleave.js
+4-6Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ if (!common.hasCrypto)
2626
common.skip('missing crypto');
2727

2828
const assert = require('assert');
29-
3029
const tls = require('tls');
3130

32-
const fs = require('fs');
31+
const fixtures = require('../common/fixtures');
3332

34-
const dir = common.fixturesDir;
35-
const options = { key: fs.readFileSync(`${dir}/test_key.pem`),
36-
cert: fs.readFileSync(`${dir}/test_cert.pem`),
37-
ca: [ fs.readFileSync(`${dir}/test_ca.pem`) ] };
33+
const options = { key: fixtures.readSync('test_key.pem'),
34+
cert: fixtures.readSync('test_cert.pem'),
35+
ca: [ fixtures.readSync('test_ca.pem') ] };
3836

3937
const writes = [
4038
'some server data',
Collapse file

‎test/parallel/test-tls-invoke-queued.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-tls-invoke-queued.js
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@ if (!common.hasCrypto)
2626
common.skip('missing crypto');
2727

2828
const assert = require('assert');
29-
const fs = require('fs');
3029
const tls = require('tls');
3130

31+
const fixtures = require('../common/fixtures');
32+
3233
let received = '';
3334

3435
const server = tls.createServer({
35-
key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
36-
cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
36+
key: fixtures.readKey('agent1-key.pem'),
37+
cert: fixtures.readKey('agent1-cert.pem')
3738
}, common.mustCall(function(c) {
3839
c._write('hello ', null, common.mustCall(function() {
3940
c._write('world!', null, common.mustCall(function() {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.