test: remove unnecessary .toString() calls in HTTP tests · nodejs/node@f2f7d7b · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 636
• Pull requests 760
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit f2f7d7b

Browse filesBrowse the repository at this point in the historyBrowse files

addaleax

authored and

targos

committed

test: remove unnecessary .toString() calls in HTTP tests

Let’s not have bad examples in our test suite and instead use the proper way of converting stream data to UTF-8 (i.e. `stream.setEncoding('utf8')`) in all places. PR-URL: #43731 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

1 parent 61e6d78 commit f2f7d7b
Copy full SHA for f2f7d7b

19 files changed

+37-19Lines changed: 37 additions & 19 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• test/parallel
  • test-http-missing-header-separator-cr.js
  • test-http-server-close-all.js
  • test-http-server-close-idle.js
  • test-http-server-headers-timeout-delayed-headers.js
  • test-http-server-headers-timeout-interrupted-headers.js
  • test-http-server-headers-timeout-keepalive.js
  • test-http-server-headers-timeout-pipelining.js
  • test-http-server-request-timeout-delayed-body.js
  • test-http-server-request-timeout-delayed-headers.js
  • test-http-server-request-timeout-interrupted-body.js
  • test-http-server-request-timeout-interrupted-headers.js
  • test-http-server-request-timeout-keepalive.js
  • test-http-server-request-timeout-pipelining.js
  • test-http-server-request-timeout-upgrade.js
  • test-http-server-request-timeouts-mixed.js
  • test-http-transfer-encoding-repeated-chunked.js
  • test-http-transfer-encoding-smuggling.js
  • test-https-server-close-all.js
  • test-https-server-close-idle.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎test/parallel/test-http-missing-header-separator-cr.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-missing-header-separator-cr.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -26,7 +26,7 @@ server.listen(0, common.mustSucceed(() => {
26	26	let response = '';
27	27
28	28	client.on('data', common.mustCall((chunk) => {
29		- response += chunk.toString('utf-8');
	29	+ response += chunk;
30	30	}));
31	31
32	32	client.setEncoding('utf8');

Collapse file

‎test/parallel/test-http-server-close-all.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-server-close-all.js

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -31,8 +31,10 @@ server.listen(0, function() {
31	31	const client2 = connect(port);
32	32	let response = '';
33	33
	34	+ client2.setEncoding('utf8');
	35	+
34	36	client2.on('data', common.mustCall((chunk) => {
35		- response += chunk.toString('utf-8');
	37	+ response += chunk;
36	38
37	39	if (response.endsWith('0\r\n\r\n')) {
38	40	assert(response.startsWith('HTTP/1.1 200 OK\r\nConnection: keep-alive'));

Collapse file

‎test/parallel/test-http-server-close-idle.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-server-close-idle.js

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -33,8 +33,10 @@ server.listen(0, function() {
33	33	const client2 = connect(port);
34	34	let response = '';
35	35
	36	+ client2.setEncoding('utf8');
	37	+
36	38	client2.on('data', common.mustCall((chunk) => {
37		- response += chunk.toString('utf-8');
	39	+ response += chunk;
38	40
39	41	if (response.endsWith('0\r\n\r\n')) {
40	42	assert(response.startsWith('HTTP/1.1 200 OK\r\nConnection: keep-alive'));

Collapse file

‎test/parallel/test-http-server-headers-timeout-delayed-headers.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-server-headers-timeout-delayed-headers.js

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -33,8 +33,9 @@ server.listen(0, common.mustCall(() => {
33	33	const client = connect(server.address().port);
34	34	let response = '';
35	35
	36	+ client.setEncoding('utf8');
36	37	client.on('data', common.mustCall((chunk) => {
37		- response += chunk.toString('utf-8');
	38	+ response += chunk;
38	39	}));
39	40
40	41	const errOrEnd = common.mustSucceed(function(err) {

Collapse file

‎test/parallel/test-http-server-headers-timeout-interrupted-headers.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-server-headers-timeout-interrupted-headers.js

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -33,8 +33,9 @@ server.listen(0, common.mustCall(() => {
33	33	const client = connect(server.address().port);
34	34	let response = '';
35	35
	36	+ client.setEncoding('utf8');
36	37	client.on('data', common.mustCall((chunk) => {
37		- response += chunk.toString('utf-8');
	38	+ response += chunk;
38	39	}));
39	40
40	41	const errOrEnd = common.mustSucceed(function(err) {

Collapse file

‎test/parallel/test-http-server-headers-timeout-keepalive.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-server-headers-timeout-keepalive.js

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -47,8 +47,9 @@ server.listen(0, common.mustCall(() => {
47	47	let second = false;
48	48	let response = '';
49	49
	50	+ client.setEncoding('utf8');
50	51	client.on('data', common.mustCallAtLeast((chunk) => {
51		- response += chunk.toString('utf-8');
	52	+ response += chunk;
52	53
53	54	// First response has ended
54	55	if (!second && response.endsWith('\r\n\r\n')) {

Collapse file

‎test/parallel/test-http-server-headers-timeout-pipelining.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-server-headers-timeout-pipelining.js

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -33,8 +33,9 @@ server.listen(0, common.mustCall(() => {
33	33	let second = false;
34	34	let response = '';
35	35
	36	+ client.setEncoding('utf8');
36	37	client.on('data', common.mustCallAtLeast((chunk) => {
37		- response += chunk.toString('utf-8');
	38	+ response += chunk;
38	39
39	40	// First response has ended
40	41	if (!second && response.endsWith('\r\n\r\n')) {

Collapse file

‎test/parallel/test-http-server-request-timeout-delayed-body.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-server-request-timeout-delayed-body.js

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -40,8 +40,9 @@ server.listen(0, common.mustCall(() => {
40	40	const client = connect(server.address().port);
41	41	let response = '';
42	42
	43	+ client.setEncoding('utf8');
43	44	client.on('data', common.mustCall((chunk) => {
44		- response += chunk.toString('utf-8');
	45	+ response += chunk;
45	46	}));
46	47
47	48	client.resume();

Collapse file

‎test/parallel/test-http-server-request-timeout-delayed-headers.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-server-request-timeout-delayed-headers.js

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -28,8 +28,9 @@ server.listen(0, common.mustCall(() => {
28	28	const client = connect(server.address().port);
29	29	let response = '';
30	30
	31	+ client.setEncoding('utf8');
31	32	client.on('data', common.mustCall((chunk) => {
32		- response += chunk.toString('utf-8');
	33	+ response += chunk;
33	34	}));
34	35
35	36	const errOrEnd = common.mustSucceed(function(err) {

Collapse file

‎test/parallel/test-http-server-request-timeout-interrupted-body.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-server-request-timeout-interrupted-body.js

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -40,8 +40,9 @@ server.listen(0, common.mustCall(() => {
40	40	const client = connect(server.address().port);
41	41	let response = '';
42	42
	43	+ client.setEncoding('utf8');
43	44	client.on('data', common.mustCall((chunk) => {
44		- response += chunk.toString('utf-8');
	45	+ response += chunk;
45	46	}));
46	47
47	48	const errOrEnd = common.mustSucceed(function(err) {

0 commit comments

Comments

0 (0)