Commit 8389a1e
test: refactor test-pipe-file-to-http
Changing var defs to const/let, changing assert.equal to
assert.strictEqual. Wrapping functions called once with
common.mustCall
PR-URL: #10054
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>1 parent f9f2cda commit 8389a1e
1 file changed
Lines changed: 19 additions & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,20 +1,19 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - var common = require('../common'); | ||
| 3 | - var assert = require('assert'); | ||
| 4 | - var fs = require('fs'); | ||
| 5 | - var http = require('http'); | ||
| 6 | - var path = require('path'); | ||
| 7 | - var cp = require('child_process'); | ||
| 2 | + const common = require('../common'); | ||
| 3 | + const assert = require('assert'); | ||
| 4 | + const fs = require('fs'); | ||
| 5 | + const http = require('http'); | ||
| 6 | + const path = require('path'); | ||
| 7 | + const cp = require('child_process'); | ||
| 8 | 8 | ||
| 9 | 9 | common.refreshTmpDir(); | |
| 10 | 10 | ||
| 11 | - var filename = path.join(common.tmpDir || '/tmp', 'big'); | ||
| 12 | - var clientReqComplete = false; | ||
| 13 | - var count = 0; | ||
| 11 | + const filename = path.join(common.tmpDir || '/tmp', 'big'); | ||
| 12 | + let count = 0; | ||
| 14 | 13 | ||
| 15 | - var server = http.createServer(function(req, res) { | ||
| 16 | - var timeoutId; | ||
| 17 | - assert.equal('POST', req.method); | ||
| 14 | + const server = http.createServer(function(req, res) { | ||
| 15 | + let timeoutId; | ||
| 16 | + assert.strictEqual('POST', req.method); | ||
| 18 | 17 | req.pause(); | |
| 19 | 18 | ||
| 20 | 19 | setTimeout(function() { | |
@@ -36,27 +35,26 @@ var server = http.createServer(function(req, res) { | |||
| 36 | 35 | server.listen(0); | |
| 37 | 36 | ||
| 38 | 37 | server.on('listening', function() { | |
| 39 | - var cmd = common.ddCommand(filename, 10240); | ||
| 38 | + const cmd = common.ddCommand(filename, 10240); | ||
| 40 | 39 | ||
| 41 | - cp.exec(cmd, function(err, stdout, stderr) { | ||
| 40 | + cp.exec(cmd, function(err) { | ||
| 42 | 41 | if (err) throw err; | |
| 43 | 42 | makeRequest(); | |
| 44 | 43 | }); | |
| 45 | 44 | }); | |
| 46 | 45 | ||
| 47 | 46 | function makeRequest() { | |
| 48 | - var req = http.request({ | ||
| 47 | + const req = http.request({ | ||
| 49 | 48 | port: server.address().port, | |
| 50 | 49 | path: '/', | |
| 51 | 50 | method: 'POST' | |
| 52 | 51 | }); | |
| 53 | 52 | ||
| 54 | - var s = fs.ReadStream(filename); | ||
| 53 | + const s = fs.ReadStream(filename); | ||
| 55 | 54 | s.pipe(req); | |
| 56 | - s.on('close', function(err) { | ||
| 57 | - if (err) throw err; | ||
| 58 | - clientReqComplete = true; | ||
| 59 | - }); | ||
| 55 | + s.on('close', common.mustCall((err) => { | ||
| 56 | + assert.ifError(err); | ||
| 57 | + })); | ||
| 60 | 58 | ||
| 61 | 59 | req.on('response', function(res) { | |
| 62 | 60 | res.resume(); | |
@@ -67,6 +65,5 @@ function makeRequest() { | |||
| 67 | 65 | } | |
| 68 | 66 | ||
| 69 | 67 | process.on('exit', function() { | |
| 70 | - assert.equal(1024 * 10240, count); | ||
| 71 | - assert.ok(clientReqComplete); | ||
| 68 | + assert.strictEqual(1024 * 10240, count); | ||
| 72 | 69 | }); | |
0 commit comments