Skip to content

Commit 14034c2

Browse files
committed
wait for server close before next test
1 parent 0ff2c19 commit 14034c2

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

test/client-large-torrent.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ var test = require('tape')
88
var torrent = fs.readFileSync(__dirname + '/torrents/sintel-5gb.torrent')
99
var parsedTorrent = parseTorrent(torrent)
1010
var peerId = new Buffer('01234567890123456789')
11-
var port = 6881
1211

1312
test('large torrent: client.start()', function (t) {
14-
t.plan(5)
13+
t.plan(6)
1514

1615
var server = new Server({ http: false })
1716

@@ -30,7 +29,7 @@ test('large torrent: client.start()', function (t) {
3029
// remove all tracker servers except a single UDP one, for now
3130
parsedTorrent.announce = [ 'udp://127.0.0.1:' + port + '/announce' ]
3231

33-
var client = new Client(peerId, port, parsedTorrent)
32+
var client = new Client(peerId, 6881, parsedTorrent)
3433

3534
client.on('error', function (err) {
3635
t.error(err)
@@ -45,7 +44,9 @@ test('large torrent: client.start()', function (t) {
4544
client.once('peer', function (addr) {
4645
t.pass('there is at least one peer') // TODO: this shouldn't rely on an external server!
4746
client.stop()
48-
server.close()
47+
server.close(function () {
48+
t.pass('server close')
49+
})
4950
})
5051

5152
client.start()

test/server.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var peerId2 = '12345678901234567890'
99
var torrentLength = 50000
1010

1111
test('server', function (t) {
12-
t.plan(26)
12+
t.plan(27)
1313

1414
var server = new Server({ udp: false }) // { interval: 50000, compactOnly: false }
1515

@@ -100,7 +100,9 @@ test('server', function (t) {
100100
t.equal(data.complete, 0)
101101
t.equal(data.incomplete, 0)
102102

103-
server.close()
103+
server.close(function () {
104+
t.pass('server closed')
105+
})
104106
})
105107
})
106108
})

test/udp-server.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var peerId2 = '12345678901234567890'
99
var torrentLength = 50000
1010

1111
test('server', function (t) {
12-
t.plan(26)
12+
t.plan(27)
1313

1414
var server = new Server({ http: false })
1515

@@ -100,7 +100,9 @@ test('server', function (t) {
100100
t.equal(data.complete, 0)
101101
t.equal(data.incomplete, 0)
102102

103-
server.close()
103+
server.close(function () {
104+
t.pass('server close')
105+
})
104106
})
105107
})
106108
})

0 commit comments

Comments
 (0)