diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-07 11:08:55 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-07 13:59:06 +0200 |
commit | bf94b6f0a1ac2cd5304f5cc7f85434120489cab8 (patch) | |
tree | 5cdf45935c8e574c3232b095b43ae17189603164 /server/tests/api/multiple-pods.js | |
parent | 82e624233f22eba0230383c7de8a9ed3b69791a6 (diff) | |
download | PeerTube-bf94b6f0a1ac2cd5304f5cc7f85434120489cab8.tar.gz PeerTube-bf94b6f0a1ac2cd5304f5cc7f85434120489cab8.tar.zst PeerTube-bf94b6f0a1ac2cd5304f5cc7f85434120489cab8.zip |
Server: update to webseed implementation (tests, lint...)
Diffstat (limited to 'server/tests/api/multiple-pods.js')
-rw-r--r-- | server/tests/api/multiple-pods.js | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/server/tests/api/multiple-pods.js b/server/tests/api/multiple-pods.js index b86f88c22..87fab791c 100644 --- a/server/tests/api/multiple-pods.js +++ b/server/tests/api/multiple-pods.js | |||
@@ -3,16 +3,14 @@ | |||
3 | const chai = require('chai') | 3 | const chai = require('chai') |
4 | const each = require('async/each') | 4 | const each = require('async/each') |
5 | const expect = chai.expect | 5 | const expect = chai.expect |
6 | const pathUtils = require('path') | ||
7 | const series = require('async/series') | 6 | const series = require('async/series') |
7 | const webtorrent = new (require('webtorrent'))() | ||
8 | 8 | ||
9 | const loginUtils = require('../utils/login') | 9 | const loginUtils = require('../utils/login') |
10 | const miscsUtils = require('../utils/miscs') | 10 | const miscsUtils = require('../utils/miscs') |
11 | const podsUtils = require('../utils/pods') | 11 | const podsUtils = require('../utils/pods') |
12 | const serversUtils = require('../utils/servers') | 12 | const serversUtils = require('../utils/servers') |
13 | const videosUtils = require('../utils/videos') | 13 | const videosUtils = require('../utils/videos') |
14 | const webtorrent = require(pathUtils.join(__dirname, '../../lib/webtorrent')) | ||
15 | webtorrent.silent = true | ||
16 | 14 | ||
17 | describe('Test multiple pods', function () { | 15 | describe('Test multiple pods', function () { |
18 | let servers = [] | 16 | let servers = [] |
@@ -53,9 +51,6 @@ describe('Test multiple pods', function () { | |||
53 | function (next) { | 51 | function (next) { |
54 | const server = servers[0] | 52 | const server = servers[0] |
55 | podsUtils.makeFriends(server.url, server.accessToken, next) | 53 | podsUtils.makeFriends(server.url, server.accessToken, next) |
56 | }, | ||
57 | function (next) { | ||
58 | webtorrent.create({ host: 'client', port: '1' }, next) | ||
59 | } | 54 | } |
60 | ], done) | 55 | ], done) |
61 | }) | 56 | }) |
@@ -415,7 +410,6 @@ describe('Test multiple pods', function () { | |||
415 | servers.forEach(function (server) { | 410 | servers.forEach(function (server) { |
416 | process.kill(-server.app.pid) | 411 | process.kill(-server.app.pid) |
417 | }) | 412 | }) |
418 | process.kill(-webtorrent.app.pid) | ||
419 | 413 | ||
420 | // Keep the logs if the test failed | 414 | // Keep the logs if the test failed |
421 | if (this.ok) { | 415 | if (this.ok) { |