1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: remove common.fixturesDir from tests

Browse Source 
Use common/fixtures module instead of common.fixturesDir.

PR-URL: https://github.com/nodejs/node/pull/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>
This commit is contained in:
Rich Trott 2017-12-02 01:26:03 -08:00
parent c84710d062
commit f9660b7166
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/parallel/test-tls-interleave.js
View File

@ -26,15 +26,13 @@ if (!common.hasCrypto)
common.skip('missing crypto'); common.skip('missing crypto');
const assert = require('assert'); const assert = require('assert');
const tls = require('tls'); const tls = require('tls');
const fs = require('fs'); const fixtures = require('../common/fixtures');
const dir = common.fixturesDir; const options = { key: fixtures.readSync('test_key.pem'),
const options = { key: fs.readFileSync(`${dir}/test_key.pem`), cert: fixtures.readSync('test_cert.pem'),
cert: fs.readFileSync(`${dir}/test_cert.pem`), ca: [ fixtures.readSync('test_ca.pem') ] };
ca: [ fs.readFileSync(`${dir}/test_ca.pem`) ] };
const writes = [ const writes = [
'some server data', 'some server data',

7
test/parallel/test-tls-invoke-queued.js
View File

@ -26,14 +26,15 @@ if (!common.hasCrypto)
common.skip('missing crypto'); common.skip('missing crypto');
const assert = require('assert'); const assert = require('assert');
const fs = require('fs');
const tls = require('tls'); const tls = require('tls');
const fixtures = require('../common/fixtures');
let received = ''; let received = '';
const server = tls.createServer({ const server = tls.createServer({
key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`), key: fixtures.readKey('agent1-key.pem'),
cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`) cert: fixtures.readKey('agent1-cert.pem')
}, common.mustCall(function(c) { }, common.mustCall(function(c) {
c._write('hello ', null, common.mustCall(function() { c._write('hello ', null, common.mustCall(function() {
c._write('world!', null, common.mustCall(function() { c._write('world!', null, common.mustCall(function() {