summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2019-10-04 20:37:51 +0200
committerAnna Henningsen <anna@addaleax.net>2019-10-09 23:54:43 +0200
commit0ff4a558afeb0ec051041e8f1f9c45d876ae0530 (patch)
treecd3a3aab0fbfc0dc614cb8f4f079567a5e333071 /test
parenta04b04f4cf162e32415bc888c0a735db54033beb (diff)
downloadandroid-node-v8-0ff4a558afeb0ec051041e8f1f9c45d876ae0530.tar.gz
android-node-v8-0ff4a558afeb0ec051041e8f1f9c45d876ae0530.tar.bz2
android-node-v8-0ff4a558afeb0ec051041e8f1f9c45d876ae0530.zip
http2: allow passing FileHandle to respondWithFD
This seems to make sense if we want to promote the use of `fs.promises`, although it’s not strictly necessary. PR-URL: https://github.com/nodejs/node/pull/29876 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Minwoo Jung <minwoo@nodesource.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'test')
-rw-r--r--test/parallel/test-http2-respond-file-fd-errors.js3
-rw-r--r--test/parallel/test-http2-respond-file-filehandle.js47
2 files changed, 49 insertions, 1 deletions
diff --git a/test/parallel/test-http2-respond-file-fd-errors.js b/test/parallel/test-http2-respond-file-fd-errors.js
index 9508cfae97..5de21e7855 100644
--- a/test/parallel/test-http2-respond-file-fd-errors.js
+++ b/test/parallel/test-http2-respond-file-fd-errors.js
@@ -42,7 +42,8 @@ server.on('stream', common.mustCall((stream) => {
{
type: TypeError,
code: 'ERR_INVALID_ARG_TYPE',
- message: 'The "fd" argument must be of type number. Received type ' +
+ message: 'The "fd" argument must be one of type number or FileHandle.' +
+ ' Received type ' +
typeof types[type]
}
);
diff --git a/test/parallel/test-http2-respond-file-filehandle.js b/test/parallel/test-http2-respond-file-filehandle.js
new file mode 100644
index 0000000000..bc7bfbe356
--- /dev/null
+++ b/test/parallel/test-http2-respond-file-filehandle.js
@@ -0,0 +1,47 @@
+'use strict';
+
+const common = require('../common');
+const fixtures = require('../common/fixtures');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
+const http2 = require('http2');
+const assert = require('assert');
+const fs = require('fs');
+
+const {
+ HTTP2_HEADER_CONTENT_TYPE,
+ HTTP2_HEADER_CONTENT_LENGTH
+} = http2.constants;
+
+const fname = fixtures.path('elipses.txt');
+const data = fs.readFileSync(fname);
+const stat = fs.statSync(fname);
+fs.promises.open(fname, 'r').then(common.mustCall((fileHandle) => {
+ const server = http2.createServer();
+ server.on('stream', (stream) => {
+ stream.respondWithFD(fileHandle, {
+ [HTTP2_HEADER_CONTENT_TYPE]: 'text/plain',
+ [HTTP2_HEADER_CONTENT_LENGTH]: stat.size,
+ });
+ });
+ server.on('close', common.mustCall(() => fileHandle.close()));
+ server.listen(0, common.mustCall(() => {
+
+ const client = http2.connect(`http://localhost:${server.address().port}`);
+ const req = client.request();
+
+ req.on('response', common.mustCall((headers) => {
+ assert.strictEqual(headers[HTTP2_HEADER_CONTENT_TYPE], 'text/plain');
+ assert.strictEqual(+headers[HTTP2_HEADER_CONTENT_LENGTH], data.length);
+ }));
+ req.setEncoding('utf8');
+ let check = '';
+ req.on('data', (chunk) => check += chunk);
+ req.on('end', common.mustCall(() => {
+ assert.strictEqual(check, data.toString('utf8'));
+ client.close();
+ server.close();
+ }));
+ req.end();
+ }));
+}));