X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fextra-utils%2Fserver%2Fservers.ts;h=4c7d6862ae8d1bbc1694463acba812062a4e5043;hb=b91bc1d1f3591c35ab4426f6ab594b4bd9f1ef62;hp=3ef4b974633a0f7a4fbe2c2c95175d6c2a43a249;hpb=913b1d71e630d5a959c763bf565a171b4dc61434;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts
index 3ef4b9746..4c7d6862a 100644
--- a/shared/extra-utils/server/servers.ts
+++ b/shared/extra-utils/server/servers.ts
@@ -3,10 +3,11 @@
 import { ChildProcess, exec, fork } from 'child_process'
 import { join } from 'path'
 import { root, wait } from '../miscs/miscs'
-import { readdir, readFile } from 'fs-extra'
+import { copy, readdir, readFile, remove } from 'fs-extra'
 import { existsSync } from 'fs'
 import { expect } from 'chai'
 import { VideoChannel } from '../../models/videos'
+import { randomInt } from '../../core-utils/miscs/miscs'
 
 interface ServerInfo {
   app: ChildProcess,
@@ -29,6 +30,8 @@ interface ServerInfo {
     email?: string
   }
 
+  customConfigFile?: string
+
   accessToken?: string
   videoChannel?: VideoChannel
 
@@ -49,6 +52,10 @@ interface ServerInfo {
   videos?: { id: number, uuid: string }[]
 }
 
+function parallelTests () {
+  return process.env.MOCHA_PARALLEL === 'true'
+}
+
 function flushAndRunMultipleServers (totalServers: number, configOverride?: Object) {
   let apps = []
   let i = 0
@@ -84,23 +91,23 @@ function randomServer () {
   const low = 10
   const high = 10000
 
-  return Math.floor(Math.random() * (high - low) + low)
+  return randomInt(low, high)
 }
 
 async function flushAndRunServer (serverNumber: number, configOverride?: Object, args = []) {
-  const parallel = process.env.MOCHA_PARALLEL === 'true'
+  const parallel = parallelTests()
 
   const internalServerNumber = parallel ? randomServer() : serverNumber
   const port = 9000 + internalServerNumber
 
-  await flushTests(serverNumber)
+  await flushTests(internalServerNumber)
 
   const server: ServerInfo = {
     app: null,
     port,
     internalServerNumber,
     parallel,
-    serverNumber: internalServerNumber,
+    serverNumber,
     url: `http://localhost:${port}`,
     host: `localhost:${port}`,
     client: {
@@ -116,7 +123,7 @@ async function flushAndRunServer (serverNumber: number, configOverride?: Object,
   return runServer(server, configOverride, args)
 }
 
-function runServer (server: ServerInfo, configOverrideArg?: any, args = []) {
+async function runServer (server: ServerInfo, configOverrideArg?: any, args = []) {
   // These actions are async so we need to be sure that they have both been done
   const serverRunString = {
     'Server listening': false
@@ -131,15 +138,19 @@ function runServer (server: ServerInfo, configOverrideArg?: any, args = []) {
     user_password: 'User password: (.+)'
   }
 
-  // Share the environment
-  const env = Object.create(process.env)
-  env['NODE_ENV'] = 'test'
-  env['NODE_APP_INSTANCE'] = server.serverNumber.toString()
+  if (server.internalServerNumber !== server.serverNumber) {
+    const basePath = join(root(), 'config')
+
+    const tmpConfigFile = join(basePath, `test-${server.internalServerNumber}.yaml`)
+    await copy(join(basePath, `test-${server.serverNumber}.yaml`), tmpConfigFile)
+
+    server.customConfigFile = tmpConfigFile
+  }
 
-  let configOverride: any = {}
+  const configOverride: any = {}
 
   if (server.parallel) {
-    configOverride = {
+    Object.assign(configOverride, {
       listen: {
         port: server.port
       },
@@ -165,18 +176,22 @@ function runServer (server: ServerInfo, configOverrideArg?: any, args = []) {
       admin: {
         email: `admin${server.internalServerNumber}@example.com`
       }
-    }
+    })
   }
 
   if (configOverrideArg !== undefined) {
     Object.assign(configOverride, configOverrideArg)
   }
 
+  // Share the environment
+  const env = Object.create(process.env)
+  env['NODE_ENV'] = 'test'
+  env['NODE_APP_INSTANCE'] = server.internalServerNumber.toString()
   env['NODE_CONFIG'] = JSON.stringify(configOverride)
 
   const options = {
     silent: true,
-    env: env,
+    env,
     detached: true
   }
 
@@ -231,7 +246,7 @@ async function checkTmpIsEmpty (server: ServerInfo) {
 }
 
 async function checkDirectoryIsEmpty (server: ServerInfo, directory: string) {
-  const testDirectory = 'test' + server.serverNumber
+  const testDirectory = 'test' + server.internalServerNumber
 
   const directoryPath = join(root(), testDirectory, directory)
 
@@ -244,7 +259,10 @@ async function checkDirectoryIsEmpty (server: ServerInfo, directory: string) {
 
 function killallServers (servers: ServerInfo[]) {
   for (const server of servers) {
+    if (!server.app) continue
+
     process.kill(-server.app.pid)
+    server.app = null
   }
 }
 
@@ -256,13 +274,17 @@ function cleanupTests (servers: ServerInfo[]) {
     if (server.parallel) {
       p.push(flushTests(server.internalServerNumber))
     }
+
+    if (server.customConfigFile) {
+      p.push(remove(server.customConfigFile))
+    }
   }
 
   return Promise.all(p)
 }
 
 async function waitUntilLog (server: ServerInfo, str: string, count = 1) {
-  const logfile = join(root(), 'test' + server.serverNumber, 'logs/peertube.log')
+  const logfile = join(root(), 'test' + server.internalServerNumber, 'logs/peertube.log')
 
   while (true) {
     const buf = await readFile(logfile)
@@ -280,6 +302,7 @@ export {
   checkDirectoryIsEmpty,
   checkTmpIsEmpty,
   ServerInfo,
+  parallelTests,
   cleanupTests,
   flushAndRunMultipleServers,
   flushTests,