From 1d7974c758d363a0037c2a7ed05a0848d3c027a4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 7 Dec 2015 17:19:13 +0100 Subject: [PATCH] Decrease the waiting time in the advanced friends test --- test/api/friendsAdvanced.js | 58 +++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/test/api/friendsAdvanced.js b/test/api/friendsAdvanced.js index 5d3891923..1103d3a97 100644 --- a/test/api/friendsAdvanced.js +++ b/test/api/friendsAdvanced.js @@ -83,45 +83,41 @@ // Expulse pod 4 from pod 1 and 2 uploadVideo(1, function () { - setTimeout(function () { - uploadVideo(1, function () { - setTimeout(function () { + uploadVideo(2, function () { + setTimeout(function () { + uploadVideo(1, function () { uploadVideo(2, function () { setTimeout(function () { - uploadVideo(2, function () { - setTimeout(function () { - // Rerun server 4 - utils.runServer(4, function (app, url) { - apps[3] = app - getFriendsList(4, function (err, res) { + // Rerun server 4 + utils.runServer(4, function (app, url) { + apps[3] = app + getFriendsList(4, function (err, res) { + if (err) throw err + // Pod 4 didn't know pod 1 and 2 removed it + expect(res.body.length).to.equal(3) + + // Pod 6 ask pod 1, 2 and 3 + makeFriend(6, function () { + getFriendsList(6, function (err, res) { if (err) throw err - // Pod 4 didn't know pod 1 and 2 removed it - expect(res.body.length).to.equal(3) - - // Pod 6 ask pod 1, 2 and 3 - makeFriend(6, function () { - getFriendsList(6, function (err, res) { - if (err) throw err - - // Pod 4 should not be our friend - var result = res.body - expect(result.length).to.equal(3) - for (var pod of result) { - expect(pod.url).not.equal(urls[3]) - } - - done() - }) - }) + + // Pod 4 should not be our friend + var result = res.body + expect(result.length).to.equal(3) + for (var pod of result) { + expect(pod.url).not.equal(urls[3]) + } + + done() }) }) - }, 15000) + }) }) }, 15000) }) - }, 15000) - }) - }, 15000) + }) + }, 11000) + }) }) }) }) -- 2.25.1