5 files changed, 17 insertions, 16 deletions

diff --git a/server/tests/api/check-params/video-abuses.ts b/server/tests/api/check-params/video-abuses.ts
index 30d15778d..eac12b6f0 100644
--- a/server/tests/api/check-params/video-abuses.ts
+++ b/server/tests/api/check-params/video-abuses.ts
@@ -106,7 +106,7 @@ describe('Test video abuses API validators', function () {
     it('Should fail with a wrong video', async function () {
       const wrongPath = '/api/v1/videos/blabla/abuse'
       const fields = {}
-      await makePostBodyRequest({ url: server.url, path: wrongPath, token: server.accessToken, fields})
+      await makePostBodyRequest({ url: server.url, path: wrongPath, token: server.accessToken, fields })
     })
 
     it('Should fail with a non authenticated user', async function () {
diff --git a/server/tests/api/friends-advanced.ts b/server/tests/api/friends-advanced.ts
index 139019398..654c959fd 100644
--- a/server/tests/api/friends-advanced.ts
+++ b/server/tests/api/friends-advanced.ts
@@ -25,12 +25,12 @@ describe('Test advanced friends', function () {
 
   async function makeFriendsWrapper (podNumber: number) {
     const server = servers[podNumber - 1]
-    return await makeFriends(server.url, server.accessToken)
+    return makeFriends(server.url, server.accessToken)
   }
 
   async function quitFriendsWrapper (podNumber: number) {
     const server = servers[podNumber - 1]
-    return await quitFriends(server.url, server.accessToken)
+    return quitFriends(server.url, server.accessToken)
   }
 
   async function removeFriendWrapper (podNumber: number, podNumberToRemove: number) {
@@ -42,12 +42,12 @@ describe('Test advanced friends', function () {
     let friendsList = res.body.data
     let podToRemove = friendsList.find(friend => (friend.host === serverToRemove.host))
 
-    return await quitOneFriend(server.url, server.accessToken, podToRemove.id)
+    return quitOneFriend(server.url, server.accessToken, podToRemove.id)
   }
 
   async function getFriendsListWrapper (podNumber: number) {
     const server = servers[podNumber - 1]
-    return await getFriendsList(server.url)
+    return getFriendsList(server.url)
   }
 
   async function uploadVideoWrapper (podNumber: number) {
@@ -56,11 +56,11 @@ describe('Test advanced friends', function () {
     }
     const server = servers[podNumber - 1]
 
-    return await uploadVideo(server.url, server.accessToken, videoAttributes)
+    return uploadVideo(server.url, server.accessToken, videoAttributes)
   }
 
   async function getVideosWrapper (podNumber: number) {
-    return await getVideosList(servers[podNumber - 1].url)
+    return getVideosList(servers[podNumber - 1].url)
   }
 
   // ---------------------------------------------------------------
diff --git a/server/tests/real-world/real-world.ts b/server/tests/real-world/real-world.ts
index e225a1266..da5696f8c 100644
--- a/server/tests/real-world/real-world.ts
+++ b/server/tests/real-world/real-world.ts
@@ -80,11 +80,15 @@ start()
 async function start () {
   const servers = await runServers(numberOfPods)
 
-  process.on('exit', async () => await exitServers(servers, flushAtExit))
+  process.on('exit', async () => {
+    await exitServers(servers, flushAtExit)
+
+    return
+  })
   process.on('SIGINT', goodbye)
   process.on('SIGTERM', goodbye)
 
-  console.log('Servers runned')
+  console.log('Servers ran')
   initializeRequestsPerServer(servers)
 
   let checking = false
@@ -150,10 +154,8 @@ function getRandomNumServer (servers) {
 }
 
 async function runServers (numberOfPods: number) {
-  let servers = null
-
-  // Run servers
-  servers = await flushAndRunMultipleServers(numberOfPods)
+  const servers: ServerInfo[] = (await flushAndRunMultipleServers(numberOfPods))
+    .map(s => Object.assign({ requestsNumber: 0 }, s))
 
   // Get the access tokens
   await setAccessTokensToServers(servers)
diff --git a/server/tests/real-world/tools/upload-directory.ts b/server/tests/real-world/tools/upload-directory.ts
index a8ab1669d..fdd56857a 100644
--- a/server/tests/real-world/tools/upload-directory.ts
+++ b/server/tests/real-world/tools/upload-directory.ts
@@ -1,7 +1,6 @@
 import * as program from 'commander'
 import * as Promise from 'bluebird'
-import { isAbsolute } from 'path'
-import { join } from 'path'
+import { isAbsolute, join } from 'path'
 
 import { readdirPromise } from '../../../helpers/core-utils'
 import { execCLI } from '../../utils'
diff --git a/server/tests/utils/servers.ts b/server/tests/utils/servers.ts
index 3526ffa51..f042a9e53 100644
--- a/server/tests/utils/servers.ts
+++ b/server/tests/utils/servers.ts
@@ -33,7 +33,7 @@ interface ServerInfo {
   }
 }
 
-async function flushAndRunMultipleServers (totalServers) {
+function flushAndRunMultipleServers (totalServers) {
   let apps = []
   let i = 0