X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Futils%2Fservers.ts;h=faa2f19ffbde02cb7fb644f8a29c43f4af370e78;hb=1b5b10d13152d704d2396a1e53d56aba1a8e7e03;hp=272a8935eef3e53fcbc9cfee64d2ed153ba66dd0;hpb=0e1dc3e7c69995c691e1dd82e3c2bc68748661ca;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/utils/servers.ts b/server/tests/utils/servers.ts index 272a8935e..faa2f19ff 100644 --- a/server/tests/utils/servers.ts +++ b/server/tests/utils/servers.ts @@ -5,6 +5,7 @@ interface ServerInfo { app: ChildProcess, url: string host: string + serverNumber: number client: { id: string, @@ -22,6 +23,8 @@ interface ServerInfo { video?: { id: number uuid: string + name: string + account: string } remoteVideo?: { @@ -30,7 +33,7 @@ interface ServerInfo { } } -async function flushAndRunMultipleServers (totalServers) { +function flushAndRunMultipleServers (totalServers) { let apps = [] let i = 0 @@ -65,9 +68,10 @@ function flushTests () { }) } -function runServer (serverNumber: number) { +function runServer (serverNumber: number, configOverride?: Object) { const server: ServerInfo = { app: null, + serverNumber: serverNumber, url: `http://localhost:${9000 + serverNumber}`, host: `localhost:${9000 + serverNumber}`, client: { @@ -98,6 +102,11 @@ function runServer (serverNumber: number) { const env = Object.create(process.env) env['NODE_ENV'] = 'test' env['NODE_APP_INSTANCE'] = serverNumber.toString() + + if (configOverride !== undefined) { + env['NODE_CONFIG'] = JSON.stringify(configOverride) + } + const options = { silent: true, env: env,