1 files changed, 20 insertions, 22 deletions

diff --git a/shared/extra-utils/mock-servers/mock-instances-index.ts b/shared/extra-utils/mock-servers/mock-instances-index.ts
index 43c2e9f6e..92b12d6f3 100644
--- a/shared/extra-utils/mock-servers/mock-instances-index.ts
+++ b/shared/extra-utils/mock-servers/mock-instances-index.ts
@@ -1,41 +1,39 @@
 import express from 'express'
 import { Server } from 'http'
-import { randomInt } from '@shared/core-utils'
-import { terminateServer } from './utils'
+import { getPort, randomListen, terminateServer } from './utils'
 
 export class MockInstancesIndex {
   private server: Server
 
   private readonly indexInstances: { host: string, createdAt: string }[] = []
 
-  initialize () {
-    return new Promise<number>(res => {
-      const app = express()
+  async initialize () {
+    const app = express()
 
-      app.use('/', (req: express.Request, res: express.Response, next: express.NextFunction) => {
-        if (process.env.DEBUG) console.log('Receiving request on mocked server %s.', req.url)
+    app.use('/', (req: express.Request, res: express.Response, next: express.NextFunction) => {
+      if (process.env.DEBUG) console.log('Receiving request on mocked server %s.', req.url)
 
-        return next()
-      })
-
-      app.get('/api/v1/instances/hosts', (req: express.Request, res: express.Response) => {
-        const since = req.query.since
+      return next()
+    })
 
-        const filtered = this.indexInstances.filter(i => {
-          if (!since) return true
+    app.get('/api/v1/instances/hosts', (req: express.Request, res: express.Response) => {
+      const since = req.query.since
 
-          return i.createdAt > since
-        })
+      const filtered = this.indexInstances.filter(i => {
+        if (!since) return true
 
-        return res.json({
-          total: filtered.length,
-          data: filtered
-        })
+        return i.createdAt > since
       })
 
-      const port = 42000 + randomInt(1, 1000)
-      this.server = app.listen(port, () => res(port))
+      return res.json({
+        total: filtered.length,
+        data: filtered
+      })
     })
+
+    this.server = await randomListen(app)
+
+    return getPort(this.server)
   }
 
   addInstance (host: string) {