Skip to content

Commit 2ce6799

Browse files
committed
tests: use after module for flow control
1 parent 52fa9c1 commit 2ce6799

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"vary": "~1.1.2"
1919
},
2020
"devDependencies": {
21+
"after": "0.8.2",
2122
"eslint": "4.19.0",
2223
"eslint-config-standard": "11.0.0",
2324
"eslint-plugin-import": "2.9.0",

test/compression.js

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
var after = require('after')
12
var assert = require('assert')
23
var Buffer = require('safe-buffer').Buffer
34
var bytes = require('bytes')
@@ -157,6 +158,7 @@ describe('compression()', function () {
157158

158159
it('should back-pressure when compressed', function (done) {
159160
var buf
161+
var cb = after(2, done)
160162
var client
161163
var drained = false
162164
var resp
@@ -171,19 +173,13 @@ describe('compression()', function () {
171173
res.write('start')
172174
pressure()
173175
})
174-
var wait = 2
175176

176177
crypto.pseudoRandomBytes(1024 * 128, function (err, chunk) {
177178
if (err) return done(err)
178179
buf = chunk
179180
pressure()
180181
})
181182

182-
function complete () {
183-
if (--wait !== 0) return
184-
done()
185-
}
186-
187183
function pressure () {
188184
if (!buf || !resp || !client) return
189185

@@ -198,7 +194,7 @@ describe('compression()', function () {
198194
resp.end()
199195
})
200196

201-
resp.on('finish', complete)
197+
resp.on('finish', cb)
202198
client.resume()
203199
}
204200

@@ -209,14 +205,15 @@ describe('compression()', function () {
209205
client = res
210206
assert.equal(res.headers['content-encoding'], 'gzip')
211207
res.pause()
212-
res.on('end', complete)
208+
res.on('end', cb)
213209
pressure()
214210
})
215211
.end()
216212
})
217213

218214
it('should back-pressure when uncompressed', function (done) {
219215
var buf
216+
var cb = after(2, done)
220217
var client
221218
var drained = false
222219
var resp
@@ -231,19 +228,13 @@ describe('compression()', function () {
231228
res.write('start')
232229
pressure()
233230
})
234-
var wait = 2
235231

236232
crypto.pseudoRandomBytes(1024 * 128, function (err, chunk) {
237233
if (err) return done(err)
238234
buf = chunk
239235
pressure()
240236
})
241237

242-
function complete () {
243-
if (--wait !== 0) return
244-
done()
245-
}
246-
247238
function pressure () {
248239
if (!buf || !resp || !client) return
249240

@@ -256,7 +247,7 @@ describe('compression()', function () {
256247
assert.ok(resp.write('end'))
257248
resp.end()
258249
})
259-
resp.on('finish', complete)
250+
resp.on('finish', cb)
260251
client.resume()
261252
}
262253

@@ -267,7 +258,7 @@ describe('compression()', function () {
267258
client = res
268259
shouldNotHaveHeader('Content-Encoding')(res)
269260
res.pause()
270-
res.on('end', complete)
261+
res.on('end', cb)
271262
pressure()
272263
})
273264
.end()

0 commit comments

Comments
 (0)