Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: improve the code in test-http-chunked-304 #10462

Closed
wants to merge 1 commit into from
Closed

test: improve the code in test-http-chunked-304 #10462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 28 additions & 25 deletions test/parallel/test-http-chunked-304.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';
var common = require('../common');
var assert = require('assert');
var http = require('http');
var net = require('net');
const common = require('../common');
const assert = require('assert');
const http = require('http');
const net = require('net');

// RFC 2616, section 10.2.5:
//
Expand All @@ -12,32 +12,35 @@ var net = require('net');
// Likewise for 304 responses. Verify that no empty chunk is sent when
// the user explicitly sets a Transfer-Encoding header.

test(204, function() {
test(304);
});
test(204);
test(304);

function test(statusCode, next) {
var server = http.createServer(function(req, res) {
function test(statusCode) {
const server = http.createServer(common.mustCall((req, res) => {
res.writeHead(statusCode, { 'Transfer-Encoding': 'chunked' });
res.end();
server.close();
});
}));

server.listen(0, function() {
var conn = net.createConnection(this.address().port, function() {
conn.write('GET / HTTP/1.1\r\n\r\n');
server.listen(0, common.mustCall(() => {
const conn = net.createConnection(
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lpinca didn't get an error before with make -j8 lint, but changed it this way to make it look better, same.. no error with make -j8 lint, let me know if this way works or if not please provide an example and will make it fit

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works now, thanks.

server.address().port,
common.mustCall(() => {
conn.write('GET / HTTP/1.1\r\n\r\n');

var resp = '';
conn.setEncoding('utf8');
conn.on('data', function(data) {
resp += data;
});
let resp = '';
conn.setEncoding('utf8');
conn.on('data', common.mustCall((data) => {
resp += data;
}));

conn.on('end', common.mustCall(function() {
assert.equal(/^Connection: close\r\n$/m.test(resp), true);
assert.equal(/^0\r\n$/m.test(resp), false);
if (next) process.nextTick(next);
}));
});
});
conn.on('end', common.mustCall(() => {
// Connection: close should be in the response
assert.strictEqual(/^Connection: close\r\n$/m.test(resp), true);
// Make sure this doesn't end with 0\r\n\r\n
assert.strictEqual(/^0\r\n$/m.test(resp), false);
}));
})
);
}));
}