Skip to content

Commit 92b29cd

Browse 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 <[email protected]> Reviewed-By: Jon Moss <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Lance Ball <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
1 parent 23967b2 commit 92b29cd

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

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

Lines 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
constassert=require('assert');
29-
3029
consttls=require('tls');
3130

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

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

3937
constwrites=[
4038
'some server data',

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

Lines 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
constassert=require('assert');
29-
constfs=require('fs');
3029
consttls=require('tls');
3130

31+
constfixtures=require('../common/fixtures');
32+
3233
letreceived='';
3334

3435
constserver=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)