X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Factivitypub%2Frefresher.ts;h=af919f2f35d2f78d827ef056b38da9e1ea6484e8;hb=6c5065a011b099618681a37bd77eaa7bd3db752e;hp=921ee874c7e9893b2f955c6cd1f561bdc7a06746;hpb=b91bc1d1f3591c35ab4426f6ab594b4bd9f1ef62;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/activitypub/refresher.ts b/server/tests/api/activitypub/refresher.ts index 921ee874c..af919f2f3 100644 --- a/server/tests/api/activitypub/refresher.ts +++ b/server/tests/api/activitypub/refresher.ts @@ -1,29 +1,24 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' +import { HttpStatusCode } from '@shared/core-utils' import { - cleanupTests, closeAllSequelize, - createVideoPlaylist, + cleanupTests, doubleFollow, flushAndRunMultipleServers, generateUserAccessToken, getVideo, - getVideoPlaylist, killallServers, reRunServer, ServerInfo, setAccessTokensToServers, - setActorField, setDefaultVideoChannel, - setPlaylistField, - setVideoField, uploadVideo, uploadVideoAndGetId, wait, waitJobs -} from '../../../../shared/extra-utils' -import { getAccount } from '../../../../shared/extra-utils/users/accounts' -import { VideoPlaylistPrivacy } from '../../../../shared/models/videos' +} from '@shared/extra-utils' +import { VideoPlaylistPrivacy } from '@shared/models' describe('Test AP refresher', function () { let servers: ServerInfo[] = [] @@ -43,32 +38,32 @@ describe('Test AP refresher', function () { 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 + 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 a1 = await generateUserAccessToken(servers[ 1 ], 'user1') - await uploadVideo(servers[ 1 ].url, a1, { name: 'video4' }) + 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 a2 = await generateUserAccessToken(servers[1], 'user2') + await uploadVideo(servers[1].url, a2, { name: 'video5' }) } { - 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 attributes = { displayName: 'playlist1', privacy: VideoPlaylistPrivacy.PUBLIC, videoChannelId: servers[1].videoChannel.id } + const created = await servers[1].playlistsCommand.create({ attributes }) + playlistUUID1 = created.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 + const attributes = { displayName: 'playlist2', privacy: VideoPlaylistPrivacy.PUBLIC, videoChannelId: servers[1].videoChannel.id } + const created = await servers[1].playlistsCommand.create({ attributes }) + playlistUUID2 = created.uuid } - await doubleFollow(servers[ 0 ], servers[ 1 ]) + await doubleFollow(servers[0], servers[1]) }) describe('Videos refresher', function () { @@ -79,38 +74,34 @@ describe('Test AP refresher', function () { await wait(10000) // Change UUID so the remote server returns a 404 - await setVideoField(servers[ 1 ].internalServerNumber, videoUUID1, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b174f') + await servers[1].sqlCommand.setVideoField(videoUUID1, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b174f') - await getVideo(servers[ 0 ].url, videoUUID1) - await getVideo(servers[ 0 ].url, videoUUID2) + await getVideo(servers[0].url, videoUUID1) + await getVideo(servers[0].url, videoUUID2) await waitJobs(servers) - await getVideo(servers[ 0 ].url, videoUUID1, 404) - await getVideo(servers[ 0 ].url, videoUUID2, 200) + await getVideo(servers[0].url, videoUUID1, HttpStatusCode.NOT_FOUND_404) + await getVideo(servers[0].url, videoUUID2, HttpStatusCode.OK_200) }) it('Should not update a remote video if the remote instance is down', async function () { - this.timeout(60000) + this.timeout(70000) - killallServers([ servers[ 1 ] ]) + await killallServers([ servers[1] ]) - await setVideoField(servers[ 1 ].internalServerNumber, videoUUID3, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b174e') + await servers[1].sqlCommand.setVideoField(videoUUID3, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b174e') // Video will need a refresh await wait(10000) - await getVideo(servers[ 0 ].url, videoUUID3) + await getVideo(servers[0].url, videoUUID3) // The refresh should fail - await waitJobs([ servers[ 0 ] ]) - - await reRunServer(servers[ 1 ]) + await waitJobs([ servers[0] ]) - // 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 reRunServer(servers[1]) - await getVideo(servers[ 0 ].url, videoUUID3, 200) + await getVideo(servers[0].url, videoUUID3, HttpStatusCode.OK_200) }) }) @@ -119,19 +110,21 @@ describe('Test AP refresher', function () { it('Should remove a deleted actor', async function () { this.timeout(60000) + const command = servers[0].accountsCommand + await wait(10000) // Change actor name so the remote server returns a 404 - const to = 'http://localhost:' + servers[ 1 ].port + '/accounts/user2' - await setActorField(servers[ 1 ].internalServerNumber, to, 'preferredUsername', 'toto') + const to = 'http://localhost:' + servers[1].port + '/accounts/user2' + await servers[1].sqlCommand.setActorField(to, 'preferredUsername', 'toto') - await getAccount(servers[ 0 ].url, 'user1@localhost:' + servers[ 1 ].port) - await getAccount(servers[ 0 ].url, 'user2@localhost:' + servers[ 1 ].port) + await command.get({ accountName: 'user1@localhost:' + servers[1].port }) + await command.get({ accountName: 'user2@localhost:' + servers[1].port }) await waitJobs(servers) - await getAccount(servers[ 0 ].url, 'user1@localhost:' + servers[ 1 ].port, 200) - await getAccount(servers[ 0 ].url, 'user2@localhost:' + servers[ 1 ].port, 404) + await command.get({ accountName: 'user1@localhost:' + servers[1].port, expectedStatus: HttpStatusCode.OK_200 }) + await command.get({ accountName: 'user2@localhost:' + servers[1].port, expectedStatus: HttpStatusCode.NOT_FOUND_404 }) }) }) @@ -143,15 +136,15 @@ describe('Test AP refresher', function () { await wait(10000) // Change UUID so the remote server returns a 404 - await setPlaylistField(servers[ 1 ].internalServerNumber, playlistUUID2, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b178e') + await servers[1].sqlCommand.setPlaylistField(playlistUUID2, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b178e') - await getVideoPlaylist(servers[ 0 ].url, playlistUUID1) - await getVideoPlaylist(servers[ 0 ].url, playlistUUID2) + await servers[0].playlistsCommand.get({ playlistId: playlistUUID1 }) + await servers[0].playlistsCommand.get({ playlistId: playlistUUID2 }) await waitJobs(servers) - await getVideoPlaylist(servers[ 0 ].url, playlistUUID1, 200) - await getVideoPlaylist(servers[ 0 ].url, playlistUUID2, 404) + await servers[0].playlistsCommand.get({ playlistId: playlistUUID1, expectedStatus: HttpStatusCode.OK_200 }) + await servers[0].playlistsCommand.get({ playlistId: playlistUUID2, expectedStatus: HttpStatusCode.NOT_FOUND_404 }) }) }) @@ -159,7 +152,5 @@ describe('Test AP refresher', function () { this.timeout(10000) await cleanupTests(servers) - - await closeAllSequelize(servers) }) })