X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fmultiple-servers.ts;h=a8c8a889b11e8774f3be5322018fafe69c6ec557;hb=3d470a530c4a48b2e4f4a9e7d4f223e14f32cea4;hp=836bdc6588ce80eb3ddafd86c81d32491ffa6ba4;hpb=b5206dfc455c119b0dcb897bd7144be6ea4d999d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index 836bdc658..a8c8a889b 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -1,13 +1,12 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ -import * as chai from 'chai' import 'mocha' -import { join } from 'path' +import * as chai from 'chai' import * as request from 'supertest' -import { VideoPrivacy } from '../../../../shared/models/videos' -import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' +import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' import { addVideoChannel, + buildAbsoluteFixturePath, checkTmpIsEmpty, checkVideoFilesWereRemoved, cleanupTests, @@ -15,7 +14,6 @@ import { createUser, dateIsValid, doubleFollow, - flushAndRunServer, flushAndRunMultipleServers, getLocalVideos, getVideo, @@ -33,14 +31,16 @@ import { wait, webtorrentAdd } from '../../../../shared/extra-utils' +import { waitJobs } from '../../../../shared/extra-utils/server/jobs' import { addVideoCommentReply, addVideoCommentThread, deleteVideoComment, + findCommentId, getVideoCommentThreads, getVideoThreadComments } from '../../../../shared/extra-utils/videos/video-comments' -import { waitJobs } from '../../../../shared/extra-utils/server/jobs' +import { VideoComment, VideoCommentThreadTree, VideoPrivacy } from '../../../../shared/models/videos' const expect = chai.expect @@ -64,9 +64,9 @@ describe('Test multiple servers', function () { displayName: 'my channel', description: 'super channel' } - await addVideoChannel(servers[ 0 ].url, servers[ 0 ].accessToken, videoChannel) - const channelRes = await getVideoChannelsList(servers[ 0 ].url, 0, 1) - videoChannelId = channelRes.body.data[ 0 ].id + await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel) + const channelRes = await getVideoChannelsList(servers[0].url, 0, 1) + videoChannelId = channelRes.body.data[0].id } // Server 1 and server 2 follow each other @@ -158,13 +158,13 @@ describe('Test multiple servers', function () { }) it('Should upload the video on server 2 and propagate on each server', async function () { - this.timeout(50000) + this.timeout(100000) const user = { username: 'user1', password: 'super_password' } - await createUser({ url: servers[ 1 ].url, accessToken: servers[ 1 ].accessToken, username: user.username, password: user.password }) + await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password }) const userAccessToken = await userLogin(servers[1], user) const videoAttributes = { @@ -180,7 +180,7 @@ describe('Test multiple servers', function () { thumbnailfile: 'thumbnail.jpg', previewfile: 'preview.jpg' } - await uploadVideo(servers[1].url, userAccessToken, videoAttributes) + await uploadVideo(servers[1].url, userAccessToken, videoAttributes, HttpStatusCode.OK_200, 'resumable') // Transcoding await waitJobs(servers) @@ -216,19 +216,19 @@ describe('Test multiple servers', function () { files: [ { resolution: 240, - size: 189000 + size: 270000 }, { resolution: 360, - size: 278000 + size: 359000 }, { resolution: 480, - size: 384000 + size: 465000 }, { resolution: 720, - size: 706000 + size: 788000 } ], thumbnailfile: 'thumbnail', @@ -517,6 +517,8 @@ describe('Test multiple servers', function () { // Wait the repeatable job await wait(6000) + await waitJobs(servers) + for (const server of servers) { const res = await getVideosList(server.url) @@ -551,6 +553,8 @@ describe('Test multiple servers', function () { // Wait the repeatable job await wait(16000) + await waitJobs(servers) + let baseVideos = null for (const server of servers) { @@ -572,7 +576,7 @@ describe('Test multiple servers', function () { }) it('Should like and dislikes videos on different services', async function () { - this.timeout(20000) + this.timeout(50000) await rateVideo(servers[0].url, servers[0].accessToken, remoteVideosServer1[0], 'like') await wait(500) @@ -587,6 +591,7 @@ describe('Test multiple servers', function () { await rateVideo(servers[2].url, servers[2].accessToken, remoteVideosServer3[0], 'like') await waitJobs(servers) + await wait(5000) let baseVideos = null for (const server of servers) { @@ -693,8 +698,8 @@ describe('Test multiple servers', function () { it('Should not have files of videos 3 and 3-2 on each server', async function () { for (const server of servers) { - await checkVideoFilesWereRemoved(toRemove[0].uuid, server.serverNumber) - await checkVideoFilesWereRemoved(toRemove[1].uuid, server.serverNumber) + await checkVideoFilesWereRemoved(toRemove[0].uuid, server.internalServerNumber) + await checkVideoFilesWereRemoved(toRemove[1].uuid, server.internalServerNumber) } }) @@ -759,38 +764,36 @@ describe('Test multiple servers', function () { { const text = 'my super first comment' - await addVideoCommentThread(servers[ 0 ].url, servers[ 0 ].accessToken, videoUUID, text) + await addVideoCommentThread(servers[0].url, servers[0].accessToken, videoUUID, text) } { const text = 'my super second comment' - await addVideoCommentThread(servers[ 2 ].url, servers[ 2 ].accessToken, videoUUID, text) + await addVideoCommentThread(servers[2].url, servers[2].accessToken, videoUUID, text) } await waitJobs(servers) { - const res = await getVideoCommentThreads(servers[1].url, videoUUID, 0, 5) - const threadId = res.body.data.find(c => c.text === 'my super first comment').id + const threadId = await findCommentId(servers[1].url, videoUUID, 'my super first comment') const text = 'my super answer to thread 1' - await addVideoCommentReply(servers[ 1 ].url, servers[ 1 ].accessToken, videoUUID, threadId, text) + await addVideoCommentReply(servers[1].url, servers[1].accessToken, videoUUID, threadId, text) } await waitJobs(servers) { - const res1 = await getVideoCommentThreads(servers[2].url, videoUUID, 0, 5) - const threadId = res1.body.data.find(c => c.text === 'my super first comment').id + const threadId = await findCommentId(servers[2].url, videoUUID, 'my super first comment') const res2 = await getVideoThreadComments(servers[2].url, videoUUID, threadId) const childCommentId = res2.body.children[0].comment.id const text3 = 'my second answer to thread 1' - await addVideoCommentReply(servers[ 2 ].url, servers[ 2 ].accessToken, videoUUID, threadId, text3) + await addVideoCommentReply(servers[2].url, servers[2].accessToken, videoUUID, threadId, text3) const text2 = 'my super answer to answer of thread 1' - await addVideoCommentReply(servers[ 2 ].url, servers[ 2 ].accessToken, videoUUID, childCommentId, text2) + await addVideoCommentReply(servers[2].url, servers[2].accessToken, videoUUID, childCommentId, text2) } await waitJobs(servers) @@ -897,9 +900,9 @@ describe('Test multiple servers', function () { it('Should delete the thread comments', async function () { this.timeout(10000) - const res = await getVideoCommentThreads(servers[ 0 ].url, videoUUID, 0, 5) + const res = await getVideoCommentThreads(servers[0].url, videoUUID, 0, 5) const threadId = res.body.data.find(c => c.text === 'my super first comment').id - await deleteVideoComment(servers[ 0 ].url, servers[ 0 ].accessToken, videoUUID, threadId) + await deleteVideoComment(servers[0].url, servers[0].accessToken, videoUUID, threadId) await waitJobs(servers) }) @@ -931,7 +934,7 @@ describe('Test multiple servers', function () { expect(deletedComment.text).to.equal('') expect(deletedComment.inReplyToCommentId).to.be.null expect(deletedComment.account).to.be.null - expect(deletedComment.totalReplies).to.equal(3) + expect(deletedComment.totalReplies).to.equal(2) expect(dateIsValid(deletedComment.createdAt as string)).to.be.true expect(dateIsValid(deletedComment.updatedAt as string)).to.be.true expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true @@ -939,54 +942,12 @@ describe('Test multiple servers', function () { } }) - it('Should retrieve all comments when subscribing to a new server', async function () { - this.timeout(120000) - - const newServer = await flushAndRunServer(4) - - await setAccessTokensToServers([newServer]) - await doubleFollow(newServer, servers[0]) - await doubleFollow(newServer, servers[2]) - await waitJobs([newServer, ...servers]) - - const res = await getVideoCommentThreads(newServer.url, videoUUID, 0, 5) - - expect(res.body.total).to.equal(2) - expect(res.body.data).to.be.an('array') - expect(res.body.data).to.have.lengthOf(2) - - { - const comment: VideoComment = res.body.data[0] - expect(comment).to.not.be.undefined - expect(comment.inReplyToCommentId).to.be.null - expect(comment.account.name).to.equal('root') - expect(comment.account.host).to.equal('localhost:' + servers[2].port) - expect(comment.totalReplies).to.equal(0) - expect(dateIsValid(comment.createdAt as string)).to.be.true - expect(dateIsValid(comment.updatedAt as string)).to.be.true - } - - { - const deletedComment: VideoComment = res.body.data[1] - expect(deletedComment).to.not.be.undefined - expect(deletedComment.isDeleted).to.be.true - expect(deletedComment.deletedAt).to.not.be.null - expect(deletedComment.text).to.equal('') - expect(deletedComment.inReplyToCommentId).to.be.null - expect(deletedComment.account).to.be.null - expect(deletedComment.totalReplies).to.equal(3) - expect(dateIsValid(deletedComment.createdAt as string)).to.be.true - expect(dateIsValid(deletedComment.updatedAt as string)).to.be.true - expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true - } - }) - it('Should delete a remote thread by the origin server', async function () { this.timeout(5000) - const res = await getVideoCommentThreads(servers[ 0 ].url, videoUUID, 0, 5) + const res = await getVideoCommentThreads(servers[0].url, videoUUID, 0, 5) const threadId = res.body.data.find(c => c.text === 'my super second comment').id - await deleteVideoComment(servers[ 0 ].url, servers[ 0 ].accessToken, videoUUID, threadId) + await deleteVideoComment(servers[0].url, servers[0].accessToken, videoUUID, threadId) await waitJobs(servers) }) @@ -1015,7 +976,7 @@ describe('Test multiple servers', function () { expect(comment.createdAt).to.not.be.null expect(comment.deletedAt).to.not.be.null expect(comment.account).to.be.null - expect(comment.totalReplies).to.equal(3) + expect(comment.totalReplies).to.equal(2) } } }) @@ -1038,7 +999,7 @@ describe('Test multiple servers', function () { expect(res.body.downloadEnabled).to.be.false const text = 'my super forbidden comment' - await addVideoCommentThread(server.url, server.accessToken, videoUUID, text, 409) + await addVideoCommentThread(server.url, server.accessToken, videoUUID, text, HttpStatusCode.CONFLICT_409) } }) }) @@ -1057,10 +1018,8 @@ describe('Test multiple servers', function () { .field('privacy', '1') .field('channelId', '1') - const filePath = join(__dirname, '..', '..', 'fixtures', 'video_short.webm') - - await req.attach('videofile', filePath) - .expect(200) + await req.attach('videofile', buildAbsoluteFixturePath('video_short.webm')) + .expect(HttpStatusCode.OK_200) await waitJobs(servers) @@ -1085,7 +1044,7 @@ describe('Test multiple servers', function () { duration: 5, commentsEnabled: true, downloadEnabled: true, - tags: [ ], + tags: [], privacy: VideoPrivacy.PUBLIC, channel: { displayName: 'Main root channel', @@ -1097,19 +1056,19 @@ describe('Test multiple servers', function () { files: [ { resolution: 720, - size: 72000 + size: 59000 }, { resolution: 480, - size: 45000 + size: 34000 }, { resolution: 360, - size: 34600 + size: 31000 }, { resolution: 240, - size: 24770 + size: 23000 } ] }