diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-01-09 14:46:16 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-01-09 14:46:16 +0100 |
commit | 2cc8ebf134b66047cd639ee7324e1ecfd5c5fd18 (patch) | |
tree | 3dbc4c7c1e1c68033834f96a857b82cb46eb8f62 | |
parent | 529594d2f014356956fdc0a033c38d1cd581c3ae (diff) | |
download | PeerTube-2cc8ebf134b66047cd639ee7324e1ecfd5c5fd18.tar.gz PeerTube-2cc8ebf134b66047cd639ee7324e1ecfd5c5fd18.tar.zst PeerTube-2cc8ebf134b66047cd639ee7324e1ecfd5c5fd18.zip |
Fix tests
-rw-r--r-- | test/api/friendsAdvanced.js | 16 | ||||
-rw-r--r-- | test/api/multiplePods.js | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/test/api/friendsAdvanced.js b/test/api/friendsAdvanced.js index 1103d3a97..a638eb0d4 100644 --- a/test/api/friendsAdvanced.js +++ b/test/api/friendsAdvanced.js | |||
@@ -50,7 +50,7 @@ | |||
50 | }) | 50 | }) |
51 | 51 | ||
52 | it('Should make friends with two pod each in a different group', function (done) { | 52 | it('Should make friends with two pod each in a different group', function (done) { |
53 | this.timeout(10000) | 53 | this.timeout(20000) |
54 | 54 | ||
55 | // Pod 3 makes friend with the first one | 55 | // Pod 3 makes friend with the first one |
56 | makeFriend(3, function () { | 56 | makeFriend(3, function () { |
@@ -58,14 +58,16 @@ | |||
58 | makeFriend(4, function () { | 58 | makeFriend(4, function () { |
59 | // Now if the fifth wants to make friends with the third et the first | 59 | // Now if the fifth wants to make friends with the third et the first |
60 | makeFriend(5, function () { | 60 | makeFriend(5, function () { |
61 | // It should have 0 friends | 61 | setTimeout(function () { |
62 | getFriendsList(5, function (err, res) { | 62 | // It should have 0 friends |
63 | if (err) throw err | 63 | getFriendsList(5, function (err, res) { |
64 | if (err) throw err | ||
64 | 65 | ||
65 | expect(res.body.length).to.equal(0) | 66 | expect(res.body.length).to.equal(0) |
66 | 67 | ||
67 | done() | 68 | done() |
68 | }) | 69 | }) |
70 | }, 11000) | ||
69 | }) | 71 | }) |
70 | }) | 72 | }) |
71 | }) | 73 | }) |
diff --git a/test/api/multiplePods.js b/test/api/multiplePods.js index dd666d73e..a831e0fa6 100644 --- a/test/api/multiplePods.js +++ b/test/api/multiplePods.js | |||
@@ -140,7 +140,7 @@ | |||
140 | }) | 140 | }) |
141 | 141 | ||
142 | it('Should upload two videos on pod 3 and propagate on each pod', function (done) { | 142 | it('Should upload two videos on pod 3 and propagate on each pod', function (done) { |
143 | this.timeout(15000) | 143 | this.timeout(30000) |
144 | 144 | ||
145 | utils.uploadVideo(urls[2], 'my super name for pod 3', 'my super description for pod 3', 'video_short3.webm', function (err) { | 145 | utils.uploadVideo(urls[2], 'my super name for pod 3', 'my super description for pod 3', 'video_short3.webm', function (err) { |
146 | if (err) throw err | 146 | if (err) throw err |
@@ -183,7 +183,7 @@ | |||
183 | 183 | ||
184 | done() | 184 | done() |
185 | }) | 185 | }) |
186 | }, 11000) | 186 | }, 22000) |
187 | }) | 187 | }) |
188 | }) | 188 | }) |
189 | }) | 189 | }) |