X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fextra-utils%2Fserver%2Fservers.ts;h=4c7d6862ae8d1bbc1694463acba812062a4e5043;hb=b91bc1d1f3591c35ab4426f6ab594b4bd9f1ef62;hp=480d1233083e20d714a83c499bf4bcd6b0132038;hpb=86ebdf8c46f0663610196b7b012ca1d9c43e1bb2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts index 480d12330..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,21 +91,23 @@ function randomServer () { const low = 10 const high = 10000 - return Math.floor(Math.random() * (high - low) + low) + return randomInt(low, high) } -function flushAndRunServer (serverNumber: number, configOverrideArg?: Object, args = []) { - const parallel = process.env.MOCHA_PARALLEL === 'true' +async function flushAndRunServer (serverNumber: number, configOverride?: Object, args = []) { + const parallel = parallelTests() const internalServerNumber = parallel ? randomServer() : serverNumber const port = 9000 + internalServerNumber + await flushTests(internalServerNumber) + const server: ServerInfo = { app: null, port, internalServerNumber, parallel, - serverNumber: internalServerNumber, + serverNumber, url: `http://localhost:${port}`, host: `localhost:${port}`, client: { @@ -111,11 +120,15 @@ function flushAndRunServer (serverNumber: number, configOverrideArg?: Object, ar } } + return runServer(server, configOverride, 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 } - const key = 'Database peertube_test' + internalServerNumber + ' is ready' + const key = 'Database peertube_test' + server.internalServerNumber + ' is ready' serverRunString[key] = false const regexps = { @@ -125,100 +138,104 @@ function flushAndRunServer (serverNumber: number, configOverrideArg?: Object, ar user_password: 'User password: (.+)' } - // Share the environment - const env = Object.create(process.env) - env['NODE_ENV'] = 'test' - env['NODE_APP_INSTANCE'] = serverNumber.toString() + if (server.internalServerNumber !== server.serverNumber) { + const basePath = join(root(), 'config') - let configOverride: any = {} + const tmpConfigFile = join(basePath, `test-${server.internalServerNumber}.yaml`) + await copy(join(basePath, `test-${server.serverNumber}.yaml`), tmpConfigFile) + + server.customConfigFile = tmpConfigFile + } - if (parallel) { - configOverride = { + const configOverride: any = {} + + if (server.parallel) { + Object.assign(configOverride, { listen: { - port: port + port: server.port }, webserver: { - port: port + port: server.port }, database: { - suffix: '_test' + internalServerNumber + suffix: '_test' + server.internalServerNumber }, storage: { - tmp: `test${internalServerNumber}/tmp/`, - avatars: `test${internalServerNumber}/avatars/`, - videos: `test${internalServerNumber}/videos/`, - streaming_playlists: `test${internalServerNumber}/streaming-playlists/`, - redundancy: `test${internalServerNumber}/redundancy/`, - logs: `test${internalServerNumber}/logs/`, - previews: `test${internalServerNumber}/previews/`, - thumbnails: `test${internalServerNumber}/thumbnails/`, - torrents: `test${internalServerNumber}/torrents/`, - captions: `test${internalServerNumber}/captions/`, - cache: `test${internalServerNumber}/cache/` + tmp: `test${server.internalServerNumber}/tmp/`, + avatars: `test${server.internalServerNumber}/avatars/`, + videos: `test${server.internalServerNumber}/videos/`, + streaming_playlists: `test${server.internalServerNumber}/streaming-playlists/`, + redundancy: `test${server.internalServerNumber}/redundancy/`, + logs: `test${server.internalServerNumber}/logs/`, + previews: `test${server.internalServerNumber}/previews/`, + thumbnails: `test${server.internalServerNumber}/thumbnails/`, + torrents: `test${server.internalServerNumber}/torrents/`, + captions: `test${server.internalServerNumber}/captions/`, + cache: `test${server.internalServerNumber}/cache/` }, admin: { - email: `admin${internalServerNumber}@example.com` + 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 } return new Promise(res => { - flushTests(internalServerNumber) - .then(() => { - - server.app = fork(join(root(), 'dist', 'server.js'), args, options) - server.app.stdout.on('data', function onStdout (data) { - let dontContinue = false - - // Capture things if we want to - for (const key of Object.keys(regexps)) { - const regexp = regexps[ key ] - const matches = data.toString().match(regexp) - if (matches !== null) { - if (key === 'client_id') server.client.id = matches[ 1 ] - else if (key === 'client_secret') server.client.secret = matches[ 1 ] - else if (key === 'user_username') server.user.username = matches[ 1 ] - else if (key === 'user_password') server.user.password = matches[ 1 ] - } - } - - // Check if all required sentences are here - for (const key of Object.keys(serverRunString)) { - if (data.toString().indexOf(key) !== -1) serverRunString[ key ] = true - if (serverRunString[ key ] === false) dontContinue = true - } - - // If no, there is maybe one thing not already initialized (client/user credentials generation...) - if (dontContinue === true) return - - server.app.stdout.removeListener('data', onStdout) - - process.on('exit', () => { - try { - process.kill(server.app.pid) - } catch { /* empty */ } - }) - - res(server) - }) + server.app = fork(join(root(), 'dist', 'server.js'), args, options) + server.app.stdout.on('data', function onStdout (data) { + let dontContinue = false + + // Capture things if we want to + for (const key of Object.keys(regexps)) { + const regexp = regexps[ key ] + const matches = data.toString().match(regexp) + if (matches !== null) { + if (key === 'client_id') server.client.id = matches[ 1 ] + else if (key === 'client_secret') server.client.secret = matches[ 1 ] + else if (key === 'user_username') server.user.username = matches[ 1 ] + else if (key === 'user_password') server.user.password = matches[ 1 ] + } + } + + // Check if all required sentences are here + for (const key of Object.keys(serverRunString)) { + if (data.toString().indexOf(key) !== -1) serverRunString[ key ] = true + if (serverRunString[ key ] === false) dontContinue = true + } + + // If no, there is maybe one thing not already initialized (client/user credentials generation...) + if (dontContinue === true) return + + server.app.stdout.removeListener('data', onStdout) + + process.on('exit', () => { + try { + process.kill(server.app.pid) + } catch { /* empty */ } }) + + res(server) + }) }) } async function reRunServer (server: ServerInfo, configOverride?: any) { - const newServer = await flushAndRunServer(server.serverNumber, configOverride) + const newServer = await runServer(server, configOverride) server.app = newServer.app return server @@ -229,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) @@ -242,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 } } @@ -254,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) @@ -278,6 +302,7 @@ export { checkDirectoryIsEmpty, checkTmpIsEmpty, ServerInfo, + parallelTests, cleanupTests, flushAndRunMultipleServers, flushTests,