Skip to content

Commit

Permalink
test: split out http2 from test-stream-pipeline
Browse files Browse the repository at this point in the history
Splitting out the http2 portion of the test has a few benfits:

* We don't skip the rest of the tests if `node` is compiled without
  crypto.
* We can find out if the http2 portion of the test is responsible for
  the timeouts reported in issue 24456.

Refs: #24456

PR-URL: #24631
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
Trott authored and targos committed Nov 25, 2018
1 parent c10b805 commit c27b948
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 32 deletions.
2 changes: 2 additions & 0 deletions test/parallel/parallel.status
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ test-net-connect-options-port: PASS,FLAKY
test-http2-pipe: PASS,FLAKY
test-worker-syntax-error: PASS,FLAKY
test-worker-syntax-error-file: PASS,FLAKY
# https://github.com/nodejs/node/issues/24456
test-stream-pipeline-http2: PASS,FLAKY

[$system==linux]

Expand Down
36 changes: 36 additions & 0 deletions test/parallel/test-stream-pipeline-http2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
'use strict';

const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');
const { Readable, pipeline } = require('stream');
const http2 = require('http2');

{
const server = http2.createServer((req, res) => {
pipeline(req, res, common.mustCall());
});

server.listen(0, () => {
const url = `http://localhost:${server.address().port}`;
const client = http2.connect(url);
const req = client.request({ ':method': 'POST' });

const rs = new Readable({
read() {
rs.push('hello');
}
});

pipeline(rs, req, common.mustCall((err) => {
server.close();
client.close();
}));

let cnt = 10;
req.on('data', (data) => {
cnt--;
if (cnt === 0) rs.destroy();
});
});
}
32 changes: 0 additions & 32 deletions test/parallel/test-stream-pipeline.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
'use strict';

const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');
const { Stream, Writable, Readable, Transform, pipeline } = require('stream');
const assert = require('assert');
const http = require('http');
const http2 = require('http2');
const { promisify } = require('util');

{
Expand Down Expand Up @@ -275,35 +272,6 @@ const { promisify } = require('util');
});
}

{
const server = http2.createServer((req, res) => {
pipeline(req, res, common.mustCall());
});

server.listen(0, () => {
const url = `http://localhost:${server.address().port}`;
const client = http2.connect(url);
const req = client.request({ ':method': 'POST' });

const rs = new Readable({
read() {
rs.push('hello');
}
});

pipeline(rs, req, common.mustCall((err) => {
server.close();
client.close();
}));

let cnt = 10;
req.on('data', (data) => {
cnt--;
if (cnt === 0) rs.destroy();
});
});
}

{
const makeTransform = () => {
const tr = new Transform({
Expand Down

0 comments on commit c27b948

Please sign in to comment.