Commit fe97fdd
test: refactor http pipelined socket test
In test-http-incoming-pipelined-socket-destory:
* setTimeout() with no duration -> setImmediate()
* eliminate unneeded exit listener
* use common.mustCall()
* var -> const/let
PR-URL: #10189
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>1 parent 4c2b79d commit fe97fdd
1 file changed
Lines changed: 12 additions & 17 deletions
Lines changed: 12 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,16 +1,17 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - require('../common'); | ||
| 2 | + const common = require('../common'); | ||
| 3 | 3 | ||
| 4 | - var http = require('http'); | ||
| 5 | - var net = require('net'); | ||
| 4 | + const http = require('http'); | ||
| 5 | + const net = require('net'); | ||
| 6 | 6 | ||
| 7 | + const seeds = [ 3, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4 ]; | ||
| 7 | 8 | ||
| 8 | 9 | // Set up some timing issues where sockets can be destroyed | |
| 9 | 10 | // via either the req or res. | |
| 10 | - var server = http.createServer(function(req, res) { | ||
| 11 | + const server = http.createServer(common.mustCall(function(req, res) { | ||
| 11 | 12 | switch (req.url) { | |
| 12 | 13 | case '/1': | |
| 13 | - return setTimeout(function() { | ||
| 14 | + return setImmediate(function() { | ||
| 14 | 15 | req.socket.destroy(); | |
| 15 | 16 | server.emit('requestDone'); | |
| 16 | 17 | }); | |
@@ -24,7 +25,7 @@ var server = http.createServer(function(req, res) { | |||
| 24 | 25 | // in one case, actually send a response in 2 chunks | |
| 25 | 26 | case '/3': | |
| 26 | 27 | res.write('hello '); | |
| 27 | - return setTimeout(function() { | ||
| 28 | + return setImmediate(function() { | ||
| 28 | 29 | res.end('world!'); | |
| 29 | 30 | server.emit('requestDone'); | |
| 30 | 31 | }); | |
@@ -33,7 +34,7 @@ var server = http.createServer(function(req, res) { | |||
| 33 | 34 | res.destroy(); | |
| 34 | 35 | server.emit('requestDone'); | |
| 35 | 36 | } | |
| 36 | - }); | ||
| 37 | + }, seeds.length)); | ||
| 37 | 38 | ||
| 38 | 39 | ||
| 39 | 40 | // Make a bunch of requests pipelined on the same socket | |
@@ -47,10 +48,9 @@ function generator(seeds) { | |||
| 47 | 48 | } | |
| 48 | 49 | ||
| 49 | 50 | ||
| 50 | - server.listen(0, function() { | ||
| 51 | - var seeds = [ 3, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4 ]; | ||
| 52 | - var client = net.connect({ port: this.address().port }); | ||
| 53 | - var done = 0; | ||
| 51 | + server.listen(0, common.mustCall(function() { | ||
| 52 | + const client = net.connect({ port: this.address().port }); | ||
| 53 | + let done = 0; | ||
| 54 | 54 | server.on('requestDone', function() { | |
| 55 | 55 | if (++done === seeds.length) { | |
| 56 | 56 | server.close(); | |
@@ -60,9 +60,4 @@ server.listen(0, function() { | |||
| 60 | 60 | // immediately write the pipelined requests. | |
| 61 | 61 | // Some of these will not have a socket to destroy! | |
| 62 | 62 | client.write(generator(seeds)); | |
| 63 | - }); | ||
| 64 | - | ||
| 65 | - process.on('exit', function(c) { | ||
| 66 | - if (!c) | ||
| 67 | - console.log('ok'); | ||
| 68 | - }); | ||
| 63 | + })); | ||
0 commit comments