From 7b5cd6bb7f1213d4791ef10e3c57b70a4faf51e5 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Fri, 11 Jul 2014 03:50:35 -0700 Subject: [PATCH] unify client http + udp test suites --- test/client.js | 73 ++++++++++++++++++++++++++++++------------- test/udp-client.js | 77 ---------------------------------------------- 2 files changed, 51 insertions(+), 99 deletions(-) delete mode 100644 test/udp-client.js diff --git a/test/client.js b/test/client.js index 395d0f3..4e723da 100644 --- a/test/client.js +++ b/test/client.js @@ -5,16 +5,15 @@ var portfinder = require('portfinder') var Server = require('../').Server var test = require('tape') -// TODO: add test where tracker doesn't support compact - var torrent = fs.readFileSync(__dirname + '/torrents/bitlove-intro.torrent') var parsedTorrent = parseTorrent(torrent) -var peerId = new Buffer('01234567890123456789') +var peerId1 = new Buffer('01234567890123456789') var announceUrl = '' var port = 6881 -function createServer (t, cb) { - var server = new Server({ udp: false }) +function createServer (t, serverType, cb) { + var opts = serverType === 'http' ? { udp: false } : { http: false } + var server = new Server(opts) server.on('error', function (err) { t.error(err) @@ -27,7 +26,7 @@ function createServer (t, cb) { portfinder.getPort(function (err, port) { if (err) return t.error(err) - announceUrl = 'http://127.0.0.1:' + port + '/announce' + announceUrl = serverType + '://127.0.0.1:' + port + '/announce' parsedTorrent.announce = [ announceUrl ] server.listen(port) @@ -35,11 +34,10 @@ function createServer (t, cb) { }) } -test('http: client.start()', function (t) { +function testClientStart (t, serverType) { t.plan(5) - - createServer(t, function (server) { - var client = new Client(peerId, port, parsedTorrent) + createServer(t, serverType, function (server) { + var client = new Client(peerId1, port, parsedTorrent) client.on('error', function (err) { t.error(err) @@ -68,13 +66,20 @@ test('http: client.start()', function (t) { client.start() }) +} + +test('http: client.start()', function (t) { + testClientStart(t, 'http') }) -test('http: client.stop()', function (t) { - t.plan(4) +test('udp: client.start()', function (t) { + testClientStart(t, 'udp') +}) - createServer(t, function (server) { - var client = new Client(peerId, port, parsedTorrent) +function testClientStop (t, serverType) { + t.plan(4) + createServer(t, serverType, function (server) { + var client = new Client(peerId1, port, parsedTorrent) client.on('error', function (err) { t.error(err) @@ -102,13 +107,20 @@ test('http: client.stop()', function (t) { }, 1000) }) +} + +test('http: client.stop()', function (t) { + testClientStop(t, 'http') }) -test('http: client.update()', function (t) { - t.plan(4) +test('udp: client.stop()', function (t) { + testClientStop(t, 'udp') +}) - createServer(t, function (server) { - var client = new Client(peerId, port, parsedTorrent, { interval: 5000 }) +function testClientUpdate (t, serverType) { + t.plan(4) + createServer(t, serverType, function (server) { + var client = new Client(peerId1, port, parsedTorrent, { interval: 5000 }) client.on('error', function (err) { t.error(err) @@ -137,13 +149,20 @@ test('http: client.update()', function (t) { }) }) }) +} + +test('http: client.update()', function (t) { + testClientUpdate(t, 'http') }) -test('http: client.scrape()', function (t) { - t.plan(5) +test('udp: client.update()', function (t) { + testClientUpdate(t, 'udp') +}) - createServer(t, function (server) { - var client = new Client(peerId, port, parsedTorrent) +function testClientScrape (t, serverType) { + t.plan(5) + createServer(t, serverType, function (server) { + var client = new Client(peerId1, port, parsedTorrent) client.on('error', function (err) { t.error(err) @@ -166,4 +185,14 @@ test('http: client.scrape()', function (t) { client.scrape() }) +} + +test('http: client.scrape()', function (t) { + testClientScrape(t, 'http') +}) + +test('udp: client.scrape()', function (t) { + testClientScrape(t, 'udp') +}) + }) diff --git a/test/udp-client.js b/test/udp-client.js deleted file mode 100644 index 2ce6dfb..0000000 --- a/test/udp-client.js +++ /dev/null @@ -1,77 +0,0 @@ -var Client = require('../') -var fs = require('fs') -var parseTorrent = require('parse-torrent') -var portfinder = require('portfinder') -var Server = require('../').Server -var test = require('tape') - -var torrent = fs.readFileSync(__dirname + '/torrents/leaves.torrent') -var parsedTorrent = parseTorrent(torrent) - -var peerId = new Buffer('01234567890123456789') -var port = 6881 - -test('udp: client.start/update/stop()', function (t) { - t.plan(12) - - var server = new Server({ udp: false }) - - server.on('error', function (err) { - t.fail(err.message) - }) - - server.on('warning', function (err) { - t.fail(err.message) - }) - - var announceUrl - portfinder.getPort(function (err, port) { - t.error(err, 'found free port') - - // remove all tracker servers except a single UDP one, for now - announceUrl = 'http://127.0.0.1:' + port + '/announce' - parsedTorrent.announce = [ announceUrl ] - - server.listen(port) - - var client = new Client(peerId, port, parsedTorrent) - - client.on('error', function (err) { - t.error(err) - }) - - client.once('update', function (data) { - t.equal(data.announce, announceUrl) - t.equal(typeof data.complete, 'number') - t.equal(typeof data.incomplete, 'number') - }) - - client.once('peer', function (addr) { - t.pass('there is at least one peer') // TODO: this shouldn't rely on an external server! - - client.once('update', function (data) { - // receive one final update after calling stop - t.equal(data.announce, announceUrl) - t.equal(typeof data.complete, 'number') - t.equal(typeof data.incomplete, 'number') - - client.once('update', function (data) { - // received an update! - t.equal(data.announce, announceUrl) - t.equal(typeof data.complete, 'number') - t.equal(typeof data.incomplete, 'number') - - server.close(function () { - t.pass('server close') - }) - }) - - client.stop() - }) - - client.update() - }) - - client.start() - }) -})