From: buoyantair Date: Thu, 15 Nov 2018 21:07:16 +0000 (+0530) Subject: Merge from upstream X-Git-Tag: v1.2.0-rc.1~88^2~4 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ae28cdf327d782e629379eee1999096ca2a5d74b;p=oweals%2Fpeertube.git Merge from upstream --- ae28cdf327d782e629379eee1999096ca2a5d74b diff --cc server/tests/api/activitypub/client.ts index 000000000,5ca8bdfd3..334cd4e5c mode 000000,100644..100644 --- a/server/tests/api/activitypub/client.ts +++ b/server/tests/api/activitypub/client.ts @@@ -1,0 -1,35 +1,43 @@@ + /* tslint:disable:no-unused-expression */ + + import * as chai from 'chai' + import 'mocha' -import { flushTests, killallServers, makeActivityPubGetRequest, runServer, ServerInfo, setAccessTokensToServers } from '../../utils' ++import { ++ flushTests, ++ killallServers, ++ makeActivityPubGetRequest, ++ runServer, ++ ServerInfo, ++ setAccessTokensToServers ++} from '../../shared/utils' ++ + + const expect = chai.expect + + describe('Test activitypub', function () { + let server: ServerInfo = null + + before(async function () { + this.timeout(30000) + + await flushTests() + + server = await runServer(1) + + await setAccessTokensToServers([ server ]) + }) + + it('Should return the account object', async function () { + const res = await makeActivityPubGetRequest(server.url, '/accounts/root') + const object = res.body + + expect(object.type).to.equal('Person') + expect(object.id).to.equal('http://localhost:9001/accounts/root') + expect(object.name).to.equal('root') + expect(object.preferredUsername).to.equal('root') + }) + + after(async function () { + killallServers([ server ]) + }) + }) diff --cc server/tests/api/server/handle-down.ts index e6e0d6c7a,0421b2b40..8e162b69e --- a/server/tests/api/server/handle-down.ts +++ b/server/tests/api/server/handle-down.ts @@@ -5,23 -5,18 +5,25 @@@ import 'mocha import { JobState, Video } from '../../../../shared/models' import { VideoPrivacy } from '../../../../shared/models/videos' import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' -import { completeVideoCheck, getVideo, immutableAssign, reRunServer, unfollow, updateVideo, viewVideo } from '../../utils' ++ import { + completeVideoCheck, + getVideo, + immutableAssign, + reRunServer, + unfollow, + viewVideo, flushAndRunMultipleServers, getVideosList, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo, ++ updateVideo, wait -} from '../../utils/index' -import { follow, getFollowersListPaginationAndSort } from '../../utils/server/follows' -import { getJobsListPaginationAndSort, waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils' +import { follow, getFollowersListPaginationAndSort } from '../../../../shared/utils/server/follows' +import { getJobsListPaginationAndSort, waitJobs } from '../../../../shared/utils/server/jobs' import { addVideoCommentReply, addVideoCommentThread, diff --cc shared/utils/index.ts index 897389824,000000000..905d93823 mode 100644,000000..100644 --- a/shared/utils/index.ts +++ b/shared/utils/index.ts @@@ -1,18 -1,0 +1,20 @@@ +export * from './server/activitypub' +export * from './cli/cli' +export * from './server/clients' +export * from './server/config' +export * from './users/login' +export * from './miscs/miscs' ++export * from './miscs/stubs' +export * from './server/follows' +export * from './requests/requests' ++export * from './requests/activitypub' +export * from './server/servers' +export * from './videos/services' +export * from './users/users' +export * from './videos/video-abuses' +export * from './videos/video-blacklist' +export * from './videos/video-channels' +export * from './videos/videos' +export * from './videos/video-change-ownership' +export * from './feeds/feeds' +export * from './search/videos' diff --cc shared/utils/server/servers.ts index 3c946db27,000000000..f358a21f1 mode 100644,000000..100644 --- a/shared/utils/server/servers.ts +++ b/shared/utils/server/servers.ts @@@ -1,185 -1,0 +1,185 @@@ +import { ChildProcess, exec, fork } from 'child_process' +import { join } from 'path' +import { root, wait } from '../miscs/miscs' +import { readFile } from 'fs-extra' + +interface ServerInfo { + app: ChildProcess, + url: string + host: string + serverNumber: number + + client: { + id: string, + secret: string + } + + user: { + username: string, + password: string, + email?: string + } + + accessToken?: string + + video?: { + id: number + uuid: string + name: string + account: { + name: string + } + } + + remoteVideo?: { + id: number + uuid: string + } +} + +function flushAndRunMultipleServers (totalServers: number, configOverride?: Object) { + let apps = [] + let i = 0 + + return new Promise(res => { + function anotherServerDone (serverNumber, app) { + apps[serverNumber - 1] = app + i++ + if (i === totalServers) { + return res(apps) + } + } + + flushTests() + .then(() => { + for (let j = 1; j <= totalServers; j++) { + runServer(j, configOverride).then(app => anotherServerDone(j, app)) + } + }) + }) +} + +function flushTests () { + return new Promise((res, rej) => { + return exec('npm run clean:server:test', err => { + if (err) return rej(err) + + return res() + }) + }) +} + - function runServer (serverNumber: number, configOverride?: Object) { ++function runServer (serverNumber: number, configOverride?: Object, args = []) { + const server: ServerInfo = { + app: null, + serverNumber: serverNumber, + url: `http://localhost:${9000 + serverNumber}`, + host: `localhost:${9000 + serverNumber}`, + client: { + id: null, + secret: null + }, + user: { + username: null, + password: null + } + } + + // 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' + serverNumber + ' is ready' + serverRunString[key] = false + + const regexps = { + client_id: 'Client id: (.+)', + client_secret: 'Client secret: (.+)', + user_username: 'Username: (.+)', + user_password: 'User password: (.+)' + } + + // Share the environment + 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, + detached: true + } + + return new Promise(res => { - server.app = fork(join(__dirname, '..', '..', '..', '..', 'dist', 'server.js'), [], options) ++ server.app = fork(join(__dirname, '..', '..', '..', '..', '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) + res(server) + }) + }) +} + +async function reRunServer (server: ServerInfo, configOverride?: any) { + const newServer = await runServer(server.serverNumber, configOverride) + server.app = newServer.app + + return server +} + +function killallServers (servers: ServerInfo[]) { + for (const server of servers) { + process.kill(-server.app.pid) + } +} + +async function waitUntilLog (server: ServerInfo, str: string, count = 1) { + const logfile = join(root(), 'test' + server.serverNumber, 'logs/peertube.log') + + while (true) { + const buf = await readFile(logfile) + + const matches = buf.toString().match(new RegExp(str, 'g')) + if (matches && matches.length === count) return + + await wait(1000) + } +} + +// --------------------------------------------------------------------------- + +export { + ServerInfo, + flushAndRunMultipleServers, + flushTests, + runServer, + killallServers, + reRunServer, + waitUntilLog +}