From 9f79ade627f0044606a9fbbe16ca0154661d12b9 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 19 Mar 2019 14:13:53 +0100 Subject: Refresh playlists --- server/tests/api/activitypub/refresher.ts | 130 ++++++++++++++++++++++-------- 1 file changed, 98 insertions(+), 32 deletions(-) (limited to 'server/tests/api') diff --git a/server/tests/api/activitypub/refresher.ts b/server/tests/api/activitypub/refresher.ts index 62ad8a0b5..ae4859076 100644 --- a/server/tests/api/activitypub/refresher.ts +++ b/server/tests/api/activitypub/refresher.ts @@ -2,89 +2,155 @@ import 'mocha' import { + createVideoPlaylist, doubleFollow, flushAndRunMultipleServers, + generateUserAccessToken, getVideo, + getVideoPlaylist, killallServers, reRunServer, ServerInfo, setAccessTokensToServers, + setActorField, + setDefaultVideoChannel, + setPlaylistField, + setVideoField, uploadVideo, + uploadVideoAndGetId, wait, - setVideoField, waitJobs } from '../../../../shared/utils' +import { getAccount } from '../../../../shared/utils/users/accounts' +import { VideoPlaylistPrivacy } from '../../../../shared/models/videos' describe('Test AP refresher', function () { let servers: ServerInfo[] = [] let videoUUID1: string let videoUUID2: string let videoUUID3: string + let playlistUUID1: string + let playlistUUID2: string before(async function () { this.timeout(60000) - servers = await flushAndRunMultipleServers(2) + servers = await flushAndRunMultipleServers(2, { transcoding: { enabled: false } }) // Get the access tokens await setAccessTokensToServers(servers) + await setDefaultVideoChannel(servers) + + { + videoUUID1 = (await uploadVideoAndGetId({ server: servers[ 1 ], videoName: 'video1' })).uuid + videoUUID2 = (await uploadVideoAndGetId({ server: servers[ 1 ], videoName: 'video2' })).uuid + videoUUID3 = (await uploadVideoAndGetId({ server: servers[ 1 ], videoName: 'video3' })).uuid + } { - const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video1' }) - videoUUID1 = res.body.video.uuid + const a1 = await generateUserAccessToken(servers[1], 'user1') + await uploadVideo(servers[1].url, a1, { name: 'video4' }) + + const a2 = await generateUserAccessToken(servers[1], 'user2') + await uploadVideo(servers[1].url, a2, { name: 'video5' }) } { - const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video2' }) - videoUUID2 = res.body.video.uuid + const playlistAttrs = { displayName: 'playlist1', privacy: VideoPlaylistPrivacy.PUBLIC, videoChannelId: servers[1].videoChannel.id } + const res = await createVideoPlaylist({ url: servers[1].url, token: servers[1].accessToken, playlistAttrs }) + playlistUUID1 = res.body.videoPlaylist.uuid } { - const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video3' }) - videoUUID3 = res.body.video.uuid + const playlistAttrs = { displayName: 'playlist2', privacy: VideoPlaylistPrivacy.PUBLIC, videoChannelId: servers[1].videoChannel.id } + const res = await createVideoPlaylist({ url: servers[1].url, token: servers[1].accessToken, playlistAttrs }) + playlistUUID2 = res.body.videoPlaylist.uuid } await doubleFollow(servers[0], servers[1]) }) - it('Should remove a deleted remote video', async function () { - this.timeout(60000) + describe('Videos refresher', function () { + + it('Should remove a deleted remote video', async function () { + this.timeout(60000) + + await wait(10000) + + // Change UUID so the remote server returns a 404 + await setVideoField(2, videoUUID1, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b174f') + + await getVideo(servers[ 0 ].url, videoUUID1) + await getVideo(servers[ 0 ].url, videoUUID2) + + await waitJobs(servers) - await wait(10000) + await getVideo(servers[ 0 ].url, videoUUID1, 404) + await getVideo(servers[ 0 ].url, videoUUID2, 200) + }) - // Change UUID so the remote server returns a 404 - await setVideoField(2, videoUUID1, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b174f') + it('Should not update a remote video if the remote instance is down', async function () { + this.timeout(60000) - await getVideo(servers[0].url, videoUUID1) - await getVideo(servers[0].url, videoUUID2) + killallServers([ servers[ 1 ] ]) - await waitJobs(servers) + await setVideoField(2, videoUUID3, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b174e') - await getVideo(servers[0].url, videoUUID1, 404) - await getVideo(servers[0].url, videoUUID2, 200) + // Video will need a refresh + await wait(10000) + + await getVideo(servers[ 0 ].url, videoUUID3) + // The refresh should fail + await waitJobs([ servers[ 0 ] ]) + + await reRunServer(servers[ 1 ]) + + // Should not refresh the video, even if the last refresh failed (to avoir a loop on dead instances) + await getVideo(servers[ 0 ].url, videoUUID3) + await waitJobs(servers) + + await getVideo(servers[ 0 ].url, videoUUID3, 200) + }) }) - it('Should not update a remote video if the remote instance is down', async function () { - this.timeout(60000) + describe('Actors refresher', function () { + + it('Should remove a deleted actor', async function () { + this.timeout(60000) + + await wait(10000) + + // Change actor name so the remote server returns a 404 + await setActorField(2, 'http://localhost:9002/accounts/user2', 'preferredUsername', 'toto') + + await getAccount(servers[ 0 ].url, 'user1@localhost:9002') + await getAccount(servers[ 0 ].url, 'user2@localhost:9002') + + await waitJobs(servers) + + await getAccount(servers[ 0 ].url, 'user1@localhost:9002', 200) + await getAccount(servers[ 0 ].url, 'user2@localhost:9002', 404) + }) + }) - killallServers([ servers[1] ]) + describe('Playlist refresher', function () { - await setVideoField(2, videoUUID3, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b174e') + it('Should remove a deleted playlist', async function () { + this.timeout(60000) - // Video will need a refresh - await wait(10000) + await wait(10000) - await getVideo(servers[0].url, videoUUID3) - // The refresh should fail - await waitJobs([ servers[0] ]) + // Change UUID so the remote server returns a 404 + await setPlaylistField(2, playlistUUID2, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b178e') - await reRunServer(servers[1]) + await getVideoPlaylist(servers[ 0 ].url, playlistUUID1) + await getVideoPlaylist(servers[ 0 ].url, playlistUUID2) - // Should not refresh the video, even if the last refresh failed (to avoir a loop on dead instances) - await getVideo(servers[0].url, videoUUID3) - await waitJobs(servers) + await waitJobs(servers) - await getVideo(servers[0].url, videoUUID3, 200) + await getVideoPlaylist(servers[ 0 ].url, playlistUUID1, 200) + await getVideoPlaylist(servers[ 0 ].url, playlistUUID2, 404) + }) }) after(async function () { -- cgit v1.2.3