X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2FmultiplePods.js;h=52dfda137fb06e8ab52c35fe17bccc04fddd39ae;hb=aaf61f3810e6d57c5130af959bd2860df32775e7;hp=b361e373bed0b45d24d7c076bf487dfa381e2a2d;hpb=36d560246f1d53f1d1c41d789d93349118b3492d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/multiplePods.js b/server/tests/api/multiplePods.js index b361e373b..52dfda137 100644 --- a/server/tests/api/multiplePods.js +++ b/server/tests/api/multiplePods.js @@ -11,7 +11,7 @@ webtorrent.silent = true describe('Test multiple pods', function () { let servers = [] - const to_remove = [] + const toRemove = [] before(function (done) { this.timeout(30000) @@ -19,25 +19,26 @@ describe('Test multiple pods', function () { async.series([ // Run servers function (next) { - utils.flushAndRunMultipleServers(3, function (servers_run) { - servers = servers_run + utils.flushAndRunMultipleServers(3, function (serversRun) { + servers = serversRun next() }) }, // Get the access tokens function (next) { - async.each(servers, function (server, callback_each) { - utils.loginAndGetAccessToken(server, function (err, access_token) { - if (err) return callback_each(err) + async.each(servers, function (server, callbackEach) { + utils.loginAndGetAccessToken(server, function (err, accessToken) { + if (err) return callbackEach(err) - server.access_token = access_token - callback_each() + server.accessToken = accessToken + callbackEach() }) }, next) }, // The second pod make friend with the third function (next) { - utils.makeFriends(servers[1].url, next) + const server = servers[1] + utils.makeFriends(server.url, server.accessToken, next) }, // Wait for the request between pods function (next) { @@ -45,7 +46,8 @@ describe('Test multiple pods', function () { }, // Pod 1 make friends too function (next) { - utils.makeFriends(servers[0].url, next) + const server = servers[0] + utils.makeFriends(server.url, server.accessToken, next) }, function (next) { webtorrent.create({ host: 'client', port: '1' }, next) @@ -58,8 +60,9 @@ describe('Test multiple pods', function () { utils.getVideosList(server.url, function (err, res) { if (err) throw err - expect(res.body).to.be.an('array') - expect(res.body.length).to.equal(0) + const videos = res.body.data + expect(videos).to.be.an('array') + expect(videos.length).to.equal(0) callback() }) @@ -72,7 +75,11 @@ describe('Test multiple pods', function () { async.series([ function (next) { - utils.uploadVideo(servers[0].url, servers[0].access_token, 'my super name for pod 1', 'my super description for pod 1', 'video_short1.webm', next) + const name = 'my super name for pod 1' + const description = 'my super description for pod 1' + const tags = [ 'tag1p1', 'tag2p1' ] + const file = 'video_short1.webm' + utils.uploadVideo(servers[0].url, servers[0].accessToken, name, description, tags, file, next) }, function (next) { setTimeout(next, 11000) @@ -82,20 +89,23 @@ describe('Test multiple pods', function () { if (err) throw err async.each(servers, function (server, callback) { - let base_magnet = null + let baseMagnet = null utils.getVideosList(server.url, function (err, res) { if (err) throw err - const videos = res.body + const videos = res.body.data expect(videos).to.be.an('array') expect(videos.length).to.equal(1) const video = videos[0] expect(video.name).to.equal('my super name for pod 1') expect(video.description).to.equal('my super description for pod 1') - expect(video.podUrl).to.equal('http://localhost:9001') + expect(video.podUrl).to.equal('localhost:9001') expect(video.magnetUri).to.exist expect(video.duration).to.equal(10) + expect(video.tags).to.deep.equal([ 'tag1p1', 'tag2p1' ]) + expect(utils.dateIsValid(video.createdDate)).to.be.true + expect(video.author).to.equal('root') if (server.url !== 'http://localhost:9001') { expect(video.isLocal).to.be.false @@ -104,8 +114,8 @@ describe('Test multiple pods', function () { } // All pods should have the same magnet Uri - if (base_magnet === null) { - base_magnet = video.magnetUri + if (baseMagnet === null) { + baseMagnet = video.magnetUri } else { expect(video.magnetUri).to.equal.magnetUri } @@ -127,7 +137,11 @@ describe('Test multiple pods', function () { async.series([ function (next) { - utils.uploadVideo(servers[1].url, servers[1].access_token, 'my super name for pod 2', 'my super description for pod 2', 'video_short2.webm', next) + const name = 'my super name for pod 2' + const description = 'my super description for pod 2' + const tags = [ 'tag1p2', 'tag2p2', 'tag3p2' ] + const file = 'video_short2.webm' + utils.uploadVideo(servers[1].url, servers[1].accessToken, name, description, tags, file, next) }, function (next) { setTimeout(next, 11000) @@ -137,20 +151,23 @@ describe('Test multiple pods', function () { if (err) throw err async.each(servers, function (server, callback) { - let base_magnet = null + let baseMagnet = null utils.getVideosList(server.url, function (err, res) { if (err) throw err - const videos = res.body + const videos = res.body.data expect(videos).to.be.an('array') expect(videos.length).to.equal(2) const video = videos[1] expect(video.name).to.equal('my super name for pod 2') expect(video.description).to.equal('my super description for pod 2') - expect(video.podUrl).to.equal('http://localhost:9002') + expect(video.podUrl).to.equal('localhost:9002') expect(video.magnetUri).to.exist expect(video.duration).to.equal(5) + expect(video.tags).to.deep.equal([ 'tag1p2', 'tag2p2', 'tag3p2' ]) + expect(utils.dateIsValid(video.createdDate)).to.be.true + expect(video.author).to.equal('root') if (server.url !== 'http://localhost:9002') { expect(video.isLocal).to.be.false @@ -159,8 +176,8 @@ describe('Test multiple pods', function () { } // All pods should have the same magnet Uri - if (base_magnet === null) { - base_magnet = video.magnetUri + if (baseMagnet === null) { + baseMagnet = video.magnetUri } else { expect(video.magnetUri).to.equal.magnetUri } @@ -182,10 +199,18 @@ describe('Test multiple pods', function () { async.series([ function (next) { - utils.uploadVideo(servers[2].url, servers[2].access_token, 'my super name for pod 3', 'my super description for pod 3', 'video_short3.webm', next) + const name = 'my super name for pod 3' + const description = 'my super description for pod 3' + const tags = [ 'tag1p3' ] + const file = 'video_short3.webm' + utils.uploadVideo(servers[2].url, servers[2].accessToken, name, description, tags, file, next) }, function (next) { - utils.uploadVideo(servers[2].url, servers[2].access_token, 'my super name for pod 3-2', 'my super description for pod 3-2', 'video_short.webm', next) + const name = 'my super name for pod 3-2' + const description = 'my super description for pod 3-2' + const tags = [ 'tag2p3', 'tag3p3', 'tag4p3' ] + const file = 'video_short.webm' + utils.uploadVideo(servers[2].url, servers[2].accessToken, name, description, tags, file, next) }, function (next) { setTimeout(next, 22000) @@ -193,13 +218,13 @@ describe('Test multiple pods', function () { function (err) { if (err) throw err - let base_magnet = null + let baseMagnet = null // All pods should have this video async.each(servers, function (server, callback) { utils.getVideosList(server.url, function (err, res) { if (err) throw err - const videos = res.body + const videos = res.body.data expect(videos).to.be.an('array') expect(videos.length).to.equal(4) @@ -216,15 +241,21 @@ describe('Test multiple pods', function () { expect(video1.name).to.equal('my super name for pod 3') expect(video1.description).to.equal('my super description for pod 3') - expect(video1.podUrl).to.equal('http://localhost:9003') + expect(video1.podUrl).to.equal('localhost:9003') expect(video1.magnetUri).to.exist expect(video1.duration).to.equal(5) + expect(video1.tags).to.deep.equal([ 'tag1p3' ]) + expect(video1.author).to.equal('root') + expect(utils.dateIsValid(video1.createdDate)).to.be.true expect(video2.name).to.equal('my super name for pod 3-2') expect(video2.description).to.equal('my super description for pod 3-2') - expect(video2.podUrl).to.equal('http://localhost:9003') + expect(video2.podUrl).to.equal('localhost:9003') expect(video2.magnetUri).to.exist expect(video2.duration).to.equal(5) + expect(video2.tags).to.deep.equal([ 'tag2p3', 'tag3p3', 'tag4p3' ]) + expect(video2.author).to.equal('root') + expect(utils.dateIsValid(video2.createdDate)).to.be.true if (server.url !== 'http://localhost:9003') { expect(video1.isLocal).to.be.false @@ -235,8 +266,8 @@ describe('Test multiple pods', function () { } // All pods should have the same magnet Uri - if (base_magnet === null) { - base_magnet = video2.magnetUri + if (baseMagnet === null) { + baseMagnet = video2.magnetUri } else { expect(video2.magnetUri).to.equal.magnetUri } @@ -267,9 +298,9 @@ describe('Test multiple pods', function () { utils.getVideosList(servers[2].url, function (err, res) { if (err) throw err - const video = res.body[0] - to_remove.push(res.body[2].id) - to_remove.push(res.body[3].id) + const video = res.body.data[0] + toRemove.push(res.body.data[2].id) + toRemove.push(res.body.data[3].id) webtorrent.add(video.magnetUri, function (torrent) { expect(torrent.files).to.exist @@ -288,7 +319,7 @@ describe('Test multiple pods', function () { utils.getVideosList(servers[0].url, function (err, res) { if (err) throw err - const video = res.body[1] + const video = res.body.data[1] webtorrent.add(video.magnetUri, function (torrent) { expect(torrent.files).to.exist @@ -307,14 +338,14 @@ describe('Test multiple pods', function () { utils.getVideosList(servers[1].url, function (err, res) { if (err) throw err - const video = res.body[2] + const video = res.body.data[2] webtorrent.add(video.magnetUri, function (torrent) { expect(torrent.files).to.exist expect(torrent.files.length).to.equal(1) expect(torrent.files[0].path).to.exist.and.to.not.equal('') - done() + webtorrent.remove(video.magnetUri, done) }) }) }) @@ -326,7 +357,7 @@ describe('Test multiple pods', function () { utils.getVideosList(servers[0].url, function (err, res) { if (err) throw err - const video = res.body[3] + const video = res.body.data[3] webtorrent.add(video.magnetUri, function (torrent) { expect(torrent.files).to.exist @@ -343,10 +374,10 @@ describe('Test multiple pods', function () { async.series([ function (next) { - utils.removeVideo(servers[2].url, servers[2].access_token, to_remove[0], next) + utils.removeVideo(servers[2].url, servers[2].accessToken, toRemove[0], next) }, function (next) { - utils.removeVideo(servers[2].url, servers[2].access_token, to_remove[1], next) + utils.removeVideo(servers[2].url, servers[2].accessToken, toRemove[1], next) }], function (err) { if (err) throw err @@ -360,14 +391,14 @@ describe('Test multiple pods', function () { utils.getVideosList(server.url, function (err, res) { if (err) throw err - const videos = res.body + const videos = res.body.data expect(videos).to.be.an('array') expect(videos.length).to.equal(2) expect(videos[0].id).not.to.equal(videos[1].id) - expect(videos[0].id).not.to.equal(to_remove[0]) - expect(videos[1].id).not.to.equal(to_remove[0]) - expect(videos[0].id).not.to.equal(to_remove[1]) - expect(videos[1].id).not.to.equal(to_remove[1]) + expect(videos[0].id).not.to.equal(toRemove[0]) + expect(videos[1].id).not.to.equal(toRemove[0]) + expect(videos[0].id).not.to.equal(toRemove[1]) + expect(videos[1].id).not.to.equal(toRemove[1]) callback() }) @@ -383,7 +414,7 @@ describe('Test multiple pods', function () { // Keep the logs if the test failed if (this.ok) { - utils.flushTests(done) + // utils.flushTests(done) } else { done() }