Commit 8a60aa1
test: don't check the # of chunks in test-http-1.0
As it can happen that the HTTP response is received in more than
one TCP chunk.
PR-URL: #3961
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>1 parent 8f845ba commit 8a60aa1
1 file changed
Lines changed: 5 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,10 +13,7 @@ function test(handler, request_generator, response_validator) { | |||
| 13 | 13 | var server = http.createServer(handler); | |
| 14 | 14 | ||
| 15 | 15 | var client_got_eof = false; | |
| 16 | - var server_response = { | ||
| 17 | - data: '', | ||
| 18 | - chunks: [] | ||
| 19 | - }; | ||
| 16 | + var server_response = ''; | ||
| 20 | 17 | ||
| 21 | 18 | function cleanup() { | |
| 22 | 19 | server.close(); | |
@@ -36,8 +33,7 @@ function test(handler, request_generator, response_validator) { | |||
| 36 | 33 | }); | |
| 37 | 34 | ||
| 38 | 35 | c.on('data', function(chunk) { | |
| 39 | - server_response.data += chunk; | ||
| 40 | - server_response.chunks.push(chunk); | ||
| 36 | + server_response += chunk; | ||
| 41 | 37 | }); | |
| 42 | 38 | ||
| 43 | 39 | c.on('end', function() { | |
@@ -65,7 +61,7 @@ function test(handler, request_generator, response_validator) { | |||
| 65 | 61 | } | |
| 66 | 62 | ||
| 67 | 63 | function response_validator(server_response, client_got_eof, timed_out) { | |
| 68 | - var m = server_response.data.split('\r\n\r\n'); | ||
| 64 | + var m = server_response.split('\r\n\r\n'); | ||
| 69 | 65 | assert.equal(m[1], body); | |
| 70 | 66 | assert.equal(true, client_got_eof); | |
| 71 | 67 | assert.equal(false, timed_out); | |
@@ -107,8 +103,7 @@ function test(handler, request_generator, response_validator) { | |||
| 107 | 103 | '\r\n' + | |
| 108 | 104 | 'Hello, world!'); | |
| 109 | 105 | ||
| 110 | - assert.equal(expected_response, server_response.data); | ||
| 111 | - assert.equal(1, server_response.chunks.length); | ||
| 106 | + assert.equal(expected_response, server_response); | ||
| 112 | 107 | assert.equal(true, client_got_eof); | |
| 113 | 108 | assert.equal(false, timed_out); | |
| 114 | 109 | } | |
@@ -151,8 +146,7 @@ function test(handler, request_generator, response_validator) { | |||
| 151 | 146 | '0\r\n' + | |
| 152 | 147 | '\r\n'); | |
| 153 | 148 | ||
| 154 | - assert.equal(expected_response, server_response.data); | ||
| 155 | - assert.equal(1, server_response.chunks.length); | ||
| 149 | + assert.equal(expected_response, server_response); | ||
| 156 | 150 | assert.equal(true, client_got_eof); | |
| 157 | 151 | assert.equal(false, timed_out); | |
| 158 | 152 | } | |
0 commit comments