Skip to content

Commit dc6f355

Browse files
committed
make magnet test work offline
for webtorrent#18
1 parent 387c1e5 commit dc6f355

File tree

2 files changed

+52
-24
lines changed

2 files changed

+52
-24
lines changed

test/client-large-torrent.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,19 @@ test('large torrent: client.start()', function (t) {
4141
t.equal(typeof data.incomplete, 'number')
4242
})
4343

44+
client.start()
45+
4446
client.once('peer', function (addr) {
4547
t.pass('there is at least one peer') // TODO: this shouldn't rely on an external server!
48+
4649
client.stop()
47-
server.close(function () {
48-
t.pass('server close')
50+
51+
client.once('update', function () {
52+
server.close(function () {
53+
t.pass('server close')
54+
})
4955
})
50-
})
5156

52-
client.start()
57+
})
5358
})
5459
})

test/client-magnet.js

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,73 @@
11
var Client = require('../').Client
22
var fs = require('fs')
33
var magnet = require('magnet-uri')
4+
var portfinder = require('portfinder')
5+
var Server = require('../').Server
46
var test = require('tape')
57

68
var uri = 'magnet:?xt=urn:btih:d2474e86c95b19b8bcfdb92bc12c9d44667cfa36&dn=Leaves+of+Grass+by+Walt+Whitman.epub&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80'
79
var parsedTorrent = magnet(uri)
810
var peerId = new Buffer('01234567890123456789')
9-
var announceUrl = 'udp://tracker.openbittorrent.com:80' // TODO: shouldn't rely on an external server!
10-
var port = 6881
1111

1212
test('magnet + udp: client.start/update/stop()', function (t) {
13-
t.plan(10)
13+
t.plan(12)
1414

15-
var client = new Client(peerId, port, parsedTorrent)
15+
var server = new Server({ http: false })
1616

17-
client.on('error', function (err) {
18-
t.error(err)
17+
server.on('error', function (err) {
18+
t.fail(err.message)
1919
})
2020

21-
client.once('update', function (data) {
22-
t.equal(data.announce, announceUrl)
23-
t.equal(typeof data.complete, 'number')
24-
t.equal(typeof data.incomplete, 'number')
21+
server.on('warning', function (err) {
22+
t.fail(err.message)
2523
})
2624

27-
client.once('peer', function (addr) {
28-
t.pass('there is at least one peer') // TODO: this shouldn't rely on an external server!
25+
portfinder.getPort(function (err, port) {
26+
t.error(err, 'found free port')
27+
server.listen(port)
28+
var announceUrl = 'udp://127.0.0.1:' + port // TODO: shouldn't rely on an external server!
29+
30+
// remove all tracker servers except a single UDP one, for now
31+
parsedTorrent.announce = [ announceUrl ]
32+
33+
var client = new Client(peerId, 6881, parsedTorrent)
34+
35+
client.on('error', function (err) {
36+
t.error(err)
37+
})
2938

3039
client.once('update', function (data) {
31-
// receive one final update after calling stop
3240
t.equal(data.announce, announceUrl)
3341
t.equal(typeof data.complete, 'number')
3442
t.equal(typeof data.incomplete, 'number')
43+
})
44+
45+
client.start()
46+
47+
client.once('peer', function (addr) {
48+
t.pass('there is at least one peer') // TODO: this shouldn't rely on an external server!
49+
50+
client.update()
3551

3652
client.once('update', function (data) {
37-
// received an update!
53+
// receive one final update after calling stop
3854
t.equal(data.announce, announceUrl)
3955
t.equal(typeof data.complete, 'number')
4056
t.equal(typeof data.incomplete, 'number')
41-
})
4257

43-
client.stop()
44-
})
58+
client.stop()
4559

46-
client.update()
47-
})
60+
client.once('update', function (data) {
61+
// received an update!
62+
t.equal(data.announce, announceUrl)
63+
t.equal(typeof data.complete, 'number')
64+
t.equal(typeof data.incomplete, 'number')
4865

49-
client.start()
66+
server.close(function () {
67+
t.pass('server closed')
68+
})
69+
})
70+
})
71+
})
72+
})
5073
})

0 commit comments

Comments
 (0)