X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fmultiple-servers.ts;h=68c1e9a8de3e531345f68d3f69c95cfb9548c0fa;hb=da3a3ab6829107b3ed7f18dda42648dfde41871d;hp=d35d1204a1f6a9492f7aa37beb986b6ed2824370;hpb=b1f5b93e4f1a9ae9015463c9a4946722ed87ec2e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index d35d1204a..68c1e9a8d 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -6,16 +6,41 @@ 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, completeVideoCheck, createUser, dateIsValid, doubleFollow, flushAndRunMultipleServers, flushTests, getVideo, - getVideoChannelsList, getVideosList, killallServers, rateVideo, removeVideo, ServerInfo, setAccessTokensToServers, testVideoImage, - updateVideo, uploadVideo, userLogin, viewVideo, wait, webtorrentAdd -} from '../../utils' + addVideoChannel, + checkTmpIsEmpty, + checkVideoFilesWereRemoved, cleanupTests, + completeVideoCheck, + createUser, + dateIsValid, + doubleFollow, + flushAndRunMultipleServers, + flushTests, + getLocalVideos, + getVideo, + getVideoChannelsList, + getVideosList, + killallServers, + rateVideo, + removeVideo, + ServerInfo, + setAccessTokensToServers, + testImage, + updateVideo, + uploadVideo, + userLogin, + viewVideo, + wait, + webtorrentAdd +} from '../../../../shared/extra-utils' import { - addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads, + addVideoCommentReply, + addVideoCommentThread, + deleteVideoComment, + getVideoCommentThreads, getVideoThreadComments -} from '../../utils/videos/video-comments' +} from '../../../../shared/extra-utils/videos/video-comments' +import { waitJobs } from '../../../../shared/extra-utils/server/jobs' const expect = chai.expect @@ -33,13 +58,16 @@ describe('Test multiple servers', function () { // Get the access tokens await setAccessTokensToServers(servers) - const videoChannel = { - name: 'my channel', - description: 'super channel' + { + const videoChannel = { + name: 'super_channel_name', + 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 await doubleFollow(servers[0], servers[1]) @@ -66,39 +94,50 @@ describe('Test multiple servers', function () { name: 'my super name for server 1', category: 5, licence: 4, - language: 9, + language: 'ja', nsfw: true, description: 'my super description for server 1', + support: 'my super support text for server 1', + originallyPublishedAt: '2019-02-10T13:38:14.449Z', tags: [ 'tag1p1', 'tag2p1' ], channelId: videoChannelId, fixture: 'video_short1.webm' } 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 for (const server of servers) { const isLocal = server.url === 'http://localhost:9001' const checkAttributes = { name: 'my super name for server 1', category: 5, licence: 4, - language: 9, + language: 'ja', nsfw: true, description: 'my super description for server 1', - host: 'localhost:9001', - account: 'root', + support: 'my super support text for server 1', + originallyPublishedAt: '2019-02-10T13:38:14.449Z', + account: { + name: 'root', + host: 'localhost:9001' + }, isLocal, + publishedAt, duration: 10, tags: [ 'tag1p1', 'tag2p1' ], privacy: VideoPrivacy.PUBLIC, + commentsEnabled: true, + downloadEnabled: true, channel: { - name: 'my channel', + displayName: 'my channel', + name: 'super_channel_name', description: 'super channel', isLocal }, - fixture: 'video_short.webm', + fixture: 'video_short1.webm', files: [ { resolution: 720, @@ -114,6 +153,7 @@ describe('Test multiple servers', function () { const video = videos[0] await completeVideoCheck(server.url, video, checkAttributes) + publishedAt = video.publishedAt } }) @@ -124,23 +164,26 @@ describe('Test multiple servers', function () { username: 'user1', password: 'super_password' } - await createUser(servers[1].url, servers[1].accessToken, user.username, 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 = { name: 'my super name for server 2', category: 4, licence: 3, - language: 11, + language: 'de', nsfw: true, description: 'my super description for server 2', + support: 'my super support text for server 2', tags: [ 'tag1p2', 'tag2p2', 'tag3p2' ], - fixture: 'video_short2.webm' + fixture: 'video_short2.webm', + thumbnailfile: 'thumbnail.jpg', + previewfile: 'preview.jpg' } 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) { @@ -149,17 +192,23 @@ describe('Test multiple servers', function () { name: 'my super name for server 2', category: 4, licence: 3, - language: 11, + language: 'de', nsfw: true, description: 'my super description for server 2', - host: 'localhost:9002', - account: 'user1', + support: 'my super support text for server 2', + account: { + name: 'user1', + host: 'localhost:9002' + }, isLocal, + commentsEnabled: true, + downloadEnabled: true, duration: 5, tags: [ 'tag1p2', 'tag2p2', 'tag3p2' ], privacy: VideoPrivacy.PUBLIC, channel: { - name: 'Default user1 channel', + displayName: 'Main user1 channel', + name: 'user1_channel', description: 'super channel', isLocal }, @@ -167,21 +216,23 @@ 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', + previewfile: 'preview' } const res = await getVideosList(server.url) @@ -201,9 +252,10 @@ describe('Test multiple servers', function () { name: 'my super name for server 3', category: 6, licence: 5, - language: 11, + language: 'de', nsfw: true, description: 'my super description for server 3', + support: 'my super support text for server 3', tags: [ 'tag1p3' ], fixture: 'video_short3.webm' } @@ -213,15 +265,16 @@ describe('Test multiple servers', function () { name: 'my super name for server 3-2', category: 7, licence: 6, - language: 12, + language: 'ko', nsfw: false, description: 'my super description for server 3-2', + support: 'my super support text for server 3-2', tags: [ 'tag2p3', 'tag3p3', 'tag4p3' ], fixture: 'video_short.webm' } 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) { @@ -247,17 +300,23 @@ describe('Test multiple servers', function () { name: 'my super name for server 3', category: 6, licence: 5, - language: 11, + language: 'de', nsfw: true, description: 'my super description for server 3', - host: 'localhost:9003', - account: 'root', + support: 'my super support text for server 3', + account: { + name: 'root', + host: 'localhost:9003' + }, isLocal, duration: 5, + commentsEnabled: true, + downloadEnabled: true, tags: [ 'tag1p3' ], privacy: VideoPrivacy.PUBLIC, channel: { - name: 'Default root channel', + displayName: 'Main root channel', + name: 'root_channel', description: '', isLocal }, @@ -275,21 +334,27 @@ describe('Test multiple servers', function () { name: 'my super name for server 3-2', category: 7, licence: 6, - language: 12, + language: 'ko', nsfw: false, description: 'my super description for server 3-2', - host: 'localhost:9003', - account: 'root', + support: 'my super support text for server 3-2', + account: { + name: 'root', + host: 'localhost:9003' + }, + commentsEnabled: true, + downloadEnabled: true, isLocal, duration: 5, tags: [ 'tag2p3', 'tag3p3', 'tag4p3' ], privacy: VideoPrivacy.PUBLIC, channel: { - name: 'Default root channel', + displayName: 'Main root channel', + name: 'root_channel', description: '', isLocal }, - fixture: 'video_short3.webm', + fixture: 'video_short.webm', files: [ { resolution: 720, @@ -302,6 +367,36 @@ describe('Test multiple servers', function () { }) }) + describe('It should list local videos', function () { + it('Should list only local videos on server 1', async function () { + const { body } = await getLocalVideos(servers[0].url) + + expect(body.total).to.equal(1) + expect(body.data).to.be.an('array') + expect(body.data.length).to.equal(1) + expect(body.data[0].name).to.equal('my super name for server 1') + }) + + it('Should list only local videos on server 2', async function () { + const { body } = await getLocalVideos(servers[1].url) + + expect(body.total).to.equal(1) + expect(body.data).to.be.an('array') + expect(body.data.length).to.equal(1) + expect(body.data[0].name).to.equal('my super name for server 2') + }) + + it('Should list only local videos on server 3', async function () { + const { body } = await getLocalVideos(servers[2].url) + + expect(body.total).to.equal(2) + expect(body.data).to.be.an('array') + expect(body.data.length).to.equal(2) + expect(body.data[0].name).to.equal('my super name for server 3') + expect(body.data[1].name).to.equal('my super name for server 3-2') + }) + }) + describe('Should seed the uploaded video', function () { it('Should add the file 1 by asking server 3', async function () { this.timeout(10000) @@ -375,7 +470,7 @@ describe('Test multiple servers', function () { const res2 = await getVideo(servers[0].url, video.id) const videoDetails = res2.body - const file = videoDetails.files.find(f => f.resolution === 360) + const file = videoDetails.files.find(f => f.resolution.id === 360) expect(file).not.to.be.undefined const torrent = await webtorrentAdd(file.magnetUri) @@ -404,17 +499,27 @@ describe('Test multiple servers', function () { }) it('Should view multiple videos on owned servers', async function () { - this.timeout(10000) + this.timeout(30000) const tasks: Promise[] = [] - tasks.push(viewVideo(servers[2].url, localVideosServer3[0])) - tasks.push(viewVideo(servers[2].url, localVideosServer3[0])) - tasks.push(viewVideo(servers[2].url, localVideosServer3[0])) - tasks.push(viewVideo(servers[2].url, localVideosServer3[1])) + await viewVideo(servers[2].url, localVideosServer3[0]) + await viewVideo(servers[2].url, localVideosServer3[0]) + await viewVideo(servers[2].url, localVideosServer3[0]) + await viewVideo(servers[2].url, localVideosServer3[1]) await Promise.all(tasks) + await waitJobs(servers) + + await viewVideo(servers[2].url, localVideosServer3[0]) + + await waitJobs(servers) + + await viewVideo(servers[2].url, localVideosServer3[0]) + + await waitJobs(servers) - await wait(5000) + // Wait the repeatable job + await wait(6000) for (const server of servers) { const res = await getVideosList(server.url) @@ -429,7 +534,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])) @@ -445,7 +550,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 @@ -470,18 +578,19 @@ describe('Test multiple servers', function () { it('Should like and dislikes videos on different services', async function () { this.timeout(20000) - const tasks: Promise[] = [] - tasks.push(rateVideo(servers[0].url, servers[0].accessToken, remoteVideosServer1[0], 'like')) - tasks.push(rateVideo(servers[0].url, servers[0].accessToken, remoteVideosServer1[0], 'dislike')) - tasks.push(rateVideo(servers[0].url, servers[0].accessToken, remoteVideosServer1[0], 'like')) - tasks.push(rateVideo(servers[2].url, servers[2].accessToken, localVideosServer3[1], 'like')) - tasks.push(rateVideo(servers[2].url, servers[2].accessToken, localVideosServer3[1], 'dislike')) - tasks.push(rateVideo(servers[2].url, servers[2].accessToken, remoteVideosServer3[1], 'dislike')) - tasks.push(rateVideo(servers[2].url, servers[2].accessToken, remoteVideosServer3[0], 'like')) - - await Promise.all(tasks) + await rateVideo(servers[0].url, servers[0].accessToken, remoteVideosServer1[0], 'like') + await wait(500) + await rateVideo(servers[0].url, servers[0].accessToken, remoteVideosServer1[0], 'dislike') + await wait(500) + await rateVideo(servers[0].url, servers[0].accessToken, remoteVideosServer1[0], 'like') + await rateVideo(servers[2].url, servers[2].accessToken, localVideosServer3[1], 'like') + await wait(500) + await rateVideo(servers[2].url, servers[2].accessToken, localVideosServer3[1], 'dislike') + await rateVideo(servers[2].url, servers[2].accessToken, remoteVideosServer3[1], 'dislike') + await wait(500) + 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) { @@ -512,15 +621,19 @@ describe('Test multiple servers', function () { name: 'my super video updated', category: 10, licence: 7, - language: 13, + language: 'fr', nsfw: true, description: 'my super description updated', - tags: [ 'tag_up_1', 'tag_up_2' ] + support: 'my super support text updated', + tags: [ 'tag_up_1', 'tag_up_2' ], + thumbnailfile: 'thumbnail.jpg', + originallyPublishedAt: '2019-02-11T13:38:14.449Z', + previewfile: 'preview.jpg' } 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 () { @@ -538,17 +651,24 @@ describe('Test multiple servers', function () { name: 'my super video updated', category: 10, licence: 7, - language: 13, + language: 'fr', nsfw: true, description: 'my super description updated', - host: 'localhost:9003', - account: 'root', + support: 'my super support text updated', + originallyPublishedAt: '2019-02-11T13:38:14.449Z', + account: { + name: 'root', + host: 'localhost:9003' + }, isLocal, duration: 5, + commentsEnabled: true, + downloadEnabled: true, tags: [ 'tag_up_1', 'tag_up_2' ], privacy: VideoPrivacy.PUBLIC, channel: { - name: 'Default root channel', + displayName: 'Main root channel', + name: 'root_channel', description: '', isLocal }, @@ -558,7 +678,9 @@ describe('Test multiple servers', function () { resolution: 720, size: 292677 } - ] + ], + thumbnailfile: 'thumbnail', + previewfile: 'preview' } await completeVideoCheck(server.url, videoUpdated, checkAttributes) } @@ -570,7 +692,14 @@ 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 () { + for (const server of servers) { + await checkVideoFilesWereRemoved(toRemove[0].uuid, server.serverNumber) + await checkVideoFilesWereRemoved(toRemove[1].uuid, server.serverNumber) + } }) it('Should have videos 1 and 3 on each server', async function () { @@ -604,12 +733,14 @@ describe('Test multiple servers', function () { expect(baseVideo.name).to.equal(video.name) expect(baseVideo.uuid).to.equal(video.uuid) - expect(baseVideo.category).to.equal(video.category) - expect(baseVideo.language).to.equal(video.language) - expect(baseVideo.licence).to.equal(video.licence) - expect(baseVideo.category).to.equal(video.category) + expect(baseVideo.category.id).to.equal(video.category.id) + expect(baseVideo.language.id).to.equal(video.language.id) + expect(baseVideo.licence.id).to.equal(video.licence.id) expect(baseVideo.nsfw).to.equal(video.nsfw) - expect(baseVideo.accountName).to.equal(video.accountName) + expect(baseVideo.account.name).to.equal(video.account.name) + expect(baseVideo.account.displayName).to.equal(video.account.displayName) + expect(baseVideo.account.url).to.equal(video.account.url) + expect(baseVideo.account.host).to.equal(video.account.host) expect(baseVideo.tags).to.deep.equal(video.tags) } }) @@ -619,13 +750,14 @@ describe('Test multiple servers', function () { const res = await getVideo(server.url, videoUUID) const video = res.body - const test = await testVideoImage(server.url, 'video_short1-preview.webm', video.previewPath) - expect(test).to.equal(true) + await testImage(server.url, 'video_short1-preview.webm', video.previewPath) } }) }) describe('Should comment these videos', function () { + let childOfFirstChild: VideoCommentThreadTree + it('Should add comment (threads and replies)', async function () { this.timeout(25000) @@ -639,7 +771,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) @@ -649,7 +781,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) @@ -665,7 +797,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 () { @@ -719,7 +851,7 @@ describe('Test multiple servers', function () { expect(firstChild.comment.account.host).equal('localhost:9002') expect(firstChild.children).to.have.lengthOf(1) - const childOfFirstChild = firstChild.children[0] + childOfFirstChild = firstChild.children[0] expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1') expect(childOfFirstChild.comment.account.name).equal('root') expect(childOfFirstChild.comment.account.host).equal('localhost:9003') @@ -732,11 +864,91 @@ describe('Test multiple servers', function () { expect(secondChild.children).to.have.lengthOf(0) } }) + + it('Should delete a reply', async function () { + this.timeout(10000) + + await deleteVideoComment(servers[2].url, servers[2].accessToken, videoUUID, childOfFirstChild.comment.id) + + await waitJobs(servers) + }) + + it('Should not have this comment anymore', async function () { + for (const server of servers) { + const res1 = await getVideoCommentThreads(server.url, videoUUID, 0, 5) + const threadId = res1.body.data.find(c => c.text === 'my super first comment').id + + const res2 = await getVideoThreadComments(server.url, videoUUID, threadId) + + const tree: VideoCommentThreadTree = res2.body + expect(tree.comment.text).equal('my super first comment') + + const firstChild = tree.children[0] + expect(firstChild.comment.text).to.equal('my super answer to thread 1') + expect(firstChild.children).to.have.lengthOf(0) + + const secondChild = tree.children[1] + expect(secondChild.comment.text).to.equal('my second answer to thread 1') + } + }) + + it('Should delete the thread comments', async function () { + this.timeout(10000) + + const res1 = await getVideoCommentThreads(servers[0].url, videoUUID, 0, 5) + 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 waitJobs(servers) + }) + + it('Should have the thread comments deleted on other servers too', async function () { + for (const server of servers) { + const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5) + + expect(res.body.total).to.equal(1) + expect(res.body.data).to.be.an('array') + expect(res.body.data).to.have.lengthOf(1) + + { + 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:9003') + expect(comment.totalReplies).to.equal(0) + expect(dateIsValid(comment.createdAt as string)).to.be.true + expect(dateIsValid(comment.updatedAt as string)).to.be.true + } + } + }) + + it('Should disable comments and download', async function () { + this.timeout(20000) + + const attributes = { + commentsEnabled: false, + downloadEnabled: false + } + + await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, attributes) + + await waitJobs(servers) + + for (const server of servers) { + const res = await getVideo(server.url, videoUUID) + expect(res.body.commentsEnabled).to.be.false + expect(res.body.downloadEnabled).to.be.false + + const text = 'my super forbidden comment' + await addVideoCommentThread(server.url, server.accessToken, videoUUID, text, 409) + } + }) }) 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' @@ -746,15 +958,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') - 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) @@ -768,14 +979,20 @@ describe('Test multiple servers', function () { language: null, nsfw: false, description: null, - host: 'localhost:9002', - account: 'root', + support: null, + account: { + name: 'root', + host: 'localhost:9002' + }, isLocal, duration: 5, + commentsEnabled: false, + downloadEnabled: true, tags: [ ], privacy: VideoPrivacy.PUBLIC, channel: { - name: 'Default root channel', + displayName: 'Main root channel', + name: 'root_channel', description: '', isLocal }, @@ -783,19 +1000,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 } ] } @@ -804,12 +1021,15 @@ describe('Test multiple servers', function () { }) }) - after(async function () { - killallServers(servers) + describe('TMP directory', function () { + it('Should have an empty tmp directory', async function () { + for (const server of servers) { + await checkTmpIsEmpty(server) + } + }) + }) - // Keep the logs if the test failed - if (this['ok']) { - await flushTests() - } + after(async function () { + await cleanupTests(servers) }) })