From ec5ecb79163191246c91bf77bd92d1166ab134ee Mon Sep 17 00:00:00 2001 From: Daniel Kostro Date: Fri, 6 Oct 2017 18:45:17 +0200 Subject: [PATCH 1/2] test: refactor http2 test to use the fixtures module --- test/parallel/test-http2-serve-file.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/test/parallel/test-http2-serve-file.js b/test/parallel/test-http2-serve-file.js index 492f2fcda8e7fe..a96e5fbbc5bd6c 100644 --- a/test/parallel/test-http2-serve-file.js +++ b/test/parallel/test-http2-serve-file.js @@ -1,6 +1,7 @@ 'use strict'; const common = require('../common'); +const { readSync, readKey, path } = require('../common/fixtures'); if (!common.hasCrypto) common.skip('missing crypto'); @@ -8,31 +9,24 @@ if (!common.hasCrypto) const assert = require('assert'); const http2 = require('http2'); const fs = require('fs'); -const path = require('path'); const tls = require('tls'); -const ajs_data = fs.readFileSync(path.resolve(common.fixturesDir, 'a.js'), - 'utf8'); +const ajs_data = readSync('a.js', 'utf8'); const { HTTP2_HEADER_PATH, HTTP2_HEADER_STATUS } = http2.constants; -function loadKey(keyname) { - return fs.readFileSync( - path.join(common.fixturesDir, 'keys', keyname), 'binary'); -} - -const key = loadKey('agent8-key.pem'); -const cert = loadKey('agent8-cert.pem'); -const ca = loadKey('fake-startcom-root-cert.pem'); +const key = readKey('agent8-key.pem', 'binary'); +const cert = readKey('agent8-cert.pem', 'binary'); +const ca = readKey('fake-startcom-root-cert.pem', 'binary'); const server = http2.createSecureServer({ key, cert }); server.on('stream', (stream, headers) => { const name = headers[HTTP2_HEADER_PATH].slice(1); - const file = path.resolve(common.fixturesDir, name); + const file = path(name); fs.stat(file, (err, stat) => { if (err != null || stat.isDirectory()) { stream.respond({ [HTTP2_HEADER_STATUS]: 404 }); From 7b59b97364bf042af7f03f64dc0cc29b0fb0c368 Mon Sep 17 00:00:00 2001 From: Daniel Kostro Date: Sun, 8 Oct 2017 20:27:10 +0200 Subject: [PATCH 2/2] refactor: require fixtures without destructuring Avoid confusion with the path module --- test/parallel/test-http2-serve-file.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/parallel/test-http2-serve-file.js b/test/parallel/test-http2-serve-file.js index a96e5fbbc5bd6c..af82360e464b31 100644 --- a/test/parallel/test-http2-serve-file.js +++ b/test/parallel/test-http2-serve-file.js @@ -1,7 +1,7 @@ 'use strict'; const common = require('../common'); -const { readSync, readKey, path } = require('../common/fixtures'); +const fixtures = require('../common/fixtures'); if (!common.hasCrypto) common.skip('missing crypto'); @@ -11,22 +11,22 @@ const http2 = require('http2'); const fs = require('fs'); const tls = require('tls'); -const ajs_data = readSync('a.js', 'utf8'); +const ajs_data = fixtures.readSync('a.js', 'utf8'); const { HTTP2_HEADER_PATH, HTTP2_HEADER_STATUS } = http2.constants; -const key = readKey('agent8-key.pem', 'binary'); -const cert = readKey('agent8-cert.pem', 'binary'); -const ca = readKey('fake-startcom-root-cert.pem', 'binary'); +const key = fixtures.readKey('agent8-key.pem', 'binary'); +const cert = fixtures.readKey('agent8-cert.pem', 'binary'); +const ca = fixtures.readKey('fake-startcom-root-cert.pem', 'binary'); const server = http2.createSecureServer({ key, cert }); server.on('stream', (stream, headers) => { const name = headers[HTTP2_HEADER_PATH].slice(1); - const file = path(name); + const file = fixtures.path(name); fs.stat(file, (err, stat) => { if (err != null || stat.isDirectory()) { stream.respond({ [HTTP2_HEADER_STATUS]: 404 });