X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fmultiple-servers.ts;h=6c281e49e850b6b9235db85455ee2dbff5e1a9c8;hb=73471b1a52f242e86364ffb077ea6cadb3b07ae2;hp=fc7c0cb21c8be23480368a202083190fbdcb988b;hpb=53a613171e5d3e2d31c04d85ed883dd9a37cf1fb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index fc7c0cb21..6c281e49e 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -6,16 +6,17 @@ import { join } from 'path' import * as request from 'supertest' import { VideoPrivacy } from '../../../../shared/models/videos' import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' - import { addVideoChannel, + checkTmpIsEmpty, checkVideoFilesWereRemoved, completeVideoCheck, createUser, dateIsValid, doubleFollow, flushAndRunMultipleServers, - flushTests, getLocalVideos, + flushTests, + getLocalVideos, getVideo, getVideoChannelsList, getVideosList, @@ -31,15 +32,15 @@ import { viewVideo, wait, webtorrentAdd -} from '../../utils' +} from '../../../../shared/utils' import { addVideoCommentReply, addVideoCommentThread, deleteVideoComment, getVideoCommentThreads, getVideoThreadComments -} from '../../utils/videos/video-comments' -import { getAccountsList } from '../../utils/users/accounts' +} from '../../../../shared/utils/videos/video-comments' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect @@ -59,6 +60,7 @@ describe('Test multiple servers', function () { { const videoChannel = { + name: 'super_channel_name', displayName: 'my channel', description: 'super channel' } @@ -102,7 +104,7 @@ describe('Test multiple servers', function () { } await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes) - await wait(10000) + await waitJobs(servers) // All servers should have this video let publishedAt: string = null @@ -127,7 +129,8 @@ describe('Test multiple servers', function () { privacy: VideoPrivacy.PUBLIC, commentsEnabled: true, channel: { - name: 'my channel', + displayName: 'my channel', + name: 'super_channel_name', description: 'super channel', isLocal }, @@ -177,7 +180,7 @@ describe('Test multiple servers', function () { await uploadVideo(servers[1].url, userAccessToken, videoAttributes) // Transcoding - await wait(30000) + await waitJobs(servers) // All servers should have this video for (const server of servers) { @@ -200,7 +203,8 @@ describe('Test multiple servers', function () { tags: [ 'tag1p2', 'tag2p2', 'tag3p2' ], privacy: VideoPrivacy.PUBLIC, channel: { - name: 'Default user1 channel', + displayName: 'Main user1 channel', + name: 'user1_channel', description: 'super channel', isLocal }, @@ -208,19 +212,19 @@ describe('Test multiple servers', function () { files: [ { resolution: 240, - size: 190000 + size: 187000 }, { resolution: 360, - size: 280000 + size: 278000 }, { resolution: 480, - size: 390000 + size: 383000 }, { resolution: 720, - size: 710000 + size: 706000 } ], thumbnailfile: 'thumbnail', @@ -266,7 +270,7 @@ describe('Test multiple servers', function () { } await uploadVideo(servers[2].url, servers[2].accessToken, videoAttributes2) - await wait(10000) + await waitJobs(servers) // All servers should have this video for (const server of servers) { @@ -306,7 +310,8 @@ describe('Test multiple servers', function () { tags: [ 'tag1p3' ], privacy: VideoPrivacy.PUBLIC, channel: { - name: 'Default root channel', + displayName: 'Main root channel', + name: 'root_channel', description: '', isLocal }, @@ -338,7 +343,8 @@ describe('Test multiple servers', function () { tags: [ 'tag2p3', 'tag3p3', 'tag4p3' ], privacy: VideoPrivacy.PUBLIC, channel: { - name: 'Default root channel', + displayName: 'Main root channel', + name: 'root_channel', description: '', isLocal }, @@ -487,7 +493,7 @@ describe('Test multiple servers', function () { }) it('Should view multiple videos on owned servers', async function () { - this.timeout(15000) + this.timeout(30000) const tasks: Promise[] = [] await viewVideo(servers[2].url, localVideosServer3[0]) @@ -496,15 +502,18 @@ describe('Test multiple servers', function () { await viewVideo(servers[2].url, localVideosServer3[1]) await Promise.all(tasks) - await wait(1500) + await waitJobs(servers) await viewVideo(servers[2].url, localVideosServer3[0]) - await wait(1500) + await waitJobs(servers) await viewVideo(servers[2].url, localVideosServer3[0]) - await wait(5000) + await waitJobs(servers) + + // Wait the repeatable job + await wait(6000) for (const server of servers) { const res = await getVideosList(server.url) @@ -519,7 +528,7 @@ describe('Test multiple servers', function () { }) it('Should view multiple videos on each servers', async function () { - this.timeout(15000) + this.timeout(30000) const tasks: Promise[] = [] tasks.push(viewVideo(servers[0].url, remoteVideosServer1[0])) @@ -535,7 +544,10 @@ describe('Test multiple servers', function () { await Promise.all(tasks) - await wait(10000) + await waitJobs(servers) + + // Wait the repeatable job + await wait(8000) let baseVideos = null @@ -572,7 +584,7 @@ describe('Test multiple servers', function () { await wait(200) await rateVideo(servers[2].url, servers[2].accessToken, remoteVideosServer3[0], 'like') - await wait(10000) + await waitJobs(servers) let baseVideos = null for (const server of servers) { @@ -614,7 +626,7 @@ describe('Test multiple servers', function () { await updateVideo(servers[2].url, servers[2].accessToken, toRemove[0].id, attributes) - await wait(5000) + await waitJobs(servers) }) it('Should have the video 3 updated on each server', async function () { @@ -646,7 +658,8 @@ describe('Test multiple servers', function () { tags: [ 'tag_up_1', 'tag_up_2' ], privacy: VideoPrivacy.PUBLIC, channel: { - name: 'Default root channel', + displayName: 'Main root channel', + name: 'root_channel', description: '', isLocal }, @@ -670,7 +683,7 @@ describe('Test multiple servers', function () { await removeVideo(servers[2].url, servers[2].accessToken, toRemove[0].id) await removeVideo(servers[2].url, servers[2].accessToken, toRemove[1].id) - await wait(5000) + await waitJobs(servers) }) it('Should not have files of videos 3 and 3-2 on each server', async function () { @@ -749,7 +762,7 @@ describe('Test multiple servers', function () { await addVideoCommentThread(servers[ 2 ].url, servers[ 2 ].accessToken, videoUUID, text) } - await wait(5000) + await waitJobs(servers) { const res = await getVideoCommentThreads(servers[1].url, videoUUID, 0, 5) @@ -759,7 +772,7 @@ describe('Test multiple servers', function () { await addVideoCommentReply(servers[ 1 ].url, servers[ 1 ].accessToken, videoUUID, threadId, text) } - await wait(5000) + await waitJobs(servers) { const res1 = await getVideoCommentThreads(servers[2].url, videoUUID, 0, 5) @@ -775,7 +788,7 @@ describe('Test multiple servers', function () { await addVideoCommentReply(servers[ 2 ].url, servers[ 2 ].accessToken, videoUUID, childCommentId, text2) } - await wait(5000) + await waitJobs(servers) }) it('Should have these threads', async function () { @@ -848,7 +861,7 @@ describe('Test multiple servers', function () { await deleteVideoComment(servers[2].url, servers[2].accessToken, videoUUID, childOfFirstChild.comment.id) - await wait(5000) + await waitJobs(servers) }) it('Should not have this comment anymore', async function () { @@ -877,7 +890,7 @@ describe('Test multiple servers', function () { const threadId = res1.body.data.find(c => c.text === 'my super first comment').id await deleteVideoComment(servers[0].url, servers[0].accessToken, videoUUID, threadId) - await wait(5000) + await waitJobs(servers) }) it('Should have the thread comments deleted on other servers too', async function () { @@ -910,7 +923,7 @@ describe('Test multiple servers', function () { await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, attributes) - await wait(5000) + await waitJobs(servers) for (const server of servers) { const res = await getVideo(server.url, videoUUID) @@ -924,7 +937,7 @@ describe('Test multiple servers', function () { describe('With minimum parameters', function () { it('Should upload and propagate the video', async function () { - this.timeout(50000) + this.timeout(60000) const path = '/api/v1/videos/upload' @@ -934,16 +947,14 @@ describe('Test multiple servers', function () { .set('Authorization', 'Bearer ' + servers[1].accessToken) .field('name', 'minimum parameters') .field('privacy', '1') - .field('nsfw', 'false') .field('channelId', '1') - .field('commentsEnabled', 'true') - const filePath = join(__dirname, '..', '..', 'api', 'fixtures', 'video_short.webm') + const filePath = join(__dirname, '..', '..', 'fixtures', 'video_short.webm') await req.attach('videofile', filePath) .expect(200) - await wait(25000) + await waitJobs(servers) for (const server of servers) { const res = await getVideosList(server.url) @@ -964,11 +975,12 @@ describe('Test multiple servers', function () { }, isLocal, duration: 5, - commentsEnabled: true, + commentsEnabled: false, tags: [ ], privacy: VideoPrivacy.PUBLIC, channel: { - name: 'Default root channel', + displayName: 'Main root channel', + name: 'root_channel', description: '', isLocal }, @@ -976,19 +988,19 @@ describe('Test multiple servers', function () { files: [ { resolution: 720, - size: 40315 + size: 72000 }, { resolution: 480, - size: 22808 + size: 45000 }, { resolution: 360, - size: 18617 + size: 34600 }, { resolution: 240, - size: 15217 + size: 24770 } ] } @@ -997,6 +1009,14 @@ describe('Test multiple servers', function () { }) }) + describe('TMP directory', function () { + it('Should have an empty tmp directory', async function () { + for (const server of servers) { + await checkTmpIsEmpty(server) + } + }) + }) + after(async function () { killallServers(servers)