From d1bfbdeb203b0e4f37e9468861c690171156ee29 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 22 Oct 2021 14:31:38 +0200
Subject: Random listen for mocked servers

---
 .../mock-servers/mock-joinpeertube-versions.ts     | 35 +++++++++++-----------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts')

diff --git a/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts b/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts
index 79be31f61..e7906ea56 100644
--- a/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts
+++ b/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts
@@ -1,30 +1,31 @@
 import express from 'express'
-import { randomInt } from '@shared/core-utils'
+import { Server } from 'http'
+import { getPort, randomListen } from './utils'
 
 export class MockJoinPeerTubeVersions {
+  private server: Server
   private latestVersion: 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()
-      })
+      return next()
+    })
 
-      app.get('/versions.json', (req: express.Request, res: express.Response) => {
-        return res.json({
-          peertube: {
-            latestVersion: this.latestVersion
-          }
-        })
+    app.get('/versions.json', (req: express.Request, res: express.Response) => {
+      return res.json({
+        peertube: {
+          latestVersion: this.latestVersion
+        }
       })
-
-      const port = 43000 + randomInt(1, 1000)
-      app.listen(port, () => res(port))
     })
+
+    this.server = await randomListen(app)
+
+    return getPort(this.server)
   }
 
   setLatestVersion (latestVersion: string) {
-- 
cgit v1.2.3