diff options
Diffstat (limited to 'server/tests/api/activitypub/refresher.ts')
-rw-r--r-- | server/tests/api/activitypub/refresher.ts | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/server/tests/api/activitypub/refresher.ts b/server/tests/api/activitypub/refresher.ts index 5a37dbc40..5af4b1edb 100644 --- a/server/tests/api/activitypub/refresher.ts +++ b/server/tests/api/activitypub/refresher.ts | |||
@@ -6,14 +6,11 @@ import { | |||
6 | cleanupTests, | 6 | cleanupTests, |
7 | doubleFollow, | 7 | doubleFollow, |
8 | flushAndRunMultipleServers, | 8 | flushAndRunMultipleServers, |
9 | getVideo, | ||
10 | killallServers, | 9 | killallServers, |
11 | reRunServer, | 10 | reRunServer, |
12 | ServerInfo, | 11 | ServerInfo, |
13 | setAccessTokensToServers, | 12 | setAccessTokensToServers, |
14 | setDefaultVideoChannel, | 13 | setDefaultVideoChannel, |
15 | uploadVideo, | ||
16 | uploadVideoAndGetId, | ||
17 | wait, | 14 | wait, |
18 | waitJobs | 15 | waitJobs |
19 | } from '@shared/extra-utils' | 16 | } from '@shared/extra-utils' |
@@ -37,17 +34,17 @@ describe('Test AP refresher', function () { | |||
37 | await setDefaultVideoChannel(servers) | 34 | await setDefaultVideoChannel(servers) |
38 | 35 | ||
39 | { | 36 | { |
40 | videoUUID1 = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video1' })).uuid | 37 | videoUUID1 = (await servers[1].videosCommand.quickUpload({ name: 'video1' })).uuid |
41 | videoUUID2 = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video2' })).uuid | 38 | videoUUID2 = (await servers[1].videosCommand.quickUpload({ name: 'video2' })).uuid |
42 | videoUUID3 = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video3' })).uuid | 39 | videoUUID3 = (await servers[1].videosCommand.quickUpload({ name: 'video3' })).uuid |
43 | } | 40 | } |
44 | 41 | ||
45 | { | 42 | { |
46 | const a1 = await servers[1].usersCommand.generateUserAndToken('user1') | 43 | const token1 = await servers[1].usersCommand.generateUserAndToken('user1') |
47 | await uploadVideo(servers[1].url, a1, { name: 'video4' }) | 44 | await servers[1].videosCommand.upload({ token: token1, attributes: { name: 'video4' } }) |
48 | 45 | ||
49 | const a2 = await servers[1].usersCommand.generateUserAndToken('user2') | 46 | const token2 = await servers[1].usersCommand.generateUserAndToken('user2') |
50 | await uploadVideo(servers[1].url, a2, { name: 'video5' }) | 47 | await servers[1].videosCommand.upload({ token: token2, attributes: { name: 'video5' } }) |
51 | } | 48 | } |
52 | 49 | ||
53 | { | 50 | { |
@@ -75,13 +72,13 @@ describe('Test AP refresher', function () { | |||
75 | // Change UUID so the remote server returns a 404 | 72 | // Change UUID so the remote server returns a 404 |
76 | await servers[1].sqlCommand.setVideoField(videoUUID1, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b174f') | 73 | await servers[1].sqlCommand.setVideoField(videoUUID1, 'uuid', '304afe4f-39f9-4d49-8ed7-ac57b86b174f') |
77 | 74 | ||
78 | await getVideo(servers[0].url, videoUUID1) | 75 | await servers[0].videosCommand.get({ id: videoUUID1 }) |
79 | await getVideo(servers[0].url, videoUUID2) | 76 | await servers[0].videosCommand.get({ id: videoUUID2 }) |
80 | 77 | ||
81 | await waitJobs(servers) | 78 | await waitJobs(servers) |
82 | 79 | ||
83 | await getVideo(servers[0].url, videoUUID1, HttpStatusCode.NOT_FOUND_404) | 80 | await servers[0].videosCommand.get({ id: videoUUID1, expectedStatus: HttpStatusCode.NOT_FOUND_404 }) |
84 | await getVideo(servers[0].url, videoUUID2, HttpStatusCode.OK_200) | 81 | await servers[0].videosCommand.get({ id: videoUUID2 }) |
85 | }) | 82 | }) |
86 | 83 | ||
87 | it('Should not update a remote video if the remote instance is down', async function () { | 84 | it('Should not update a remote video if the remote instance is down', async function () { |
@@ -94,13 +91,13 @@ describe('Test AP refresher', function () { | |||
94 | // Video will need a refresh | 91 | // Video will need a refresh |
95 | await wait(10000) | 92 | await wait(10000) |
96 | 93 | ||
97 | await getVideo(servers[0].url, videoUUID3) | 94 | await servers[0].videosCommand.get({ id: videoUUID3 }) |
98 | // The refresh should fail | 95 | // The refresh should fail |
99 | await waitJobs([ servers[0] ]) | 96 | await waitJobs([ servers[0] ]) |
100 | 97 | ||
101 | await reRunServer(servers[1]) | 98 | await reRunServer(servers[1]) |
102 | 99 | ||
103 | await getVideo(servers[0].url, videoUUID3, HttpStatusCode.OK_200) | 100 | await servers[0].videosCommand.get({ id: videoUUID3 }) |
104 | }) | 101 | }) |
105 | }) | 102 | }) |
106 | 103 | ||