/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import * as chai from 'chai'
import 'mocha'
-import { VideoDetails } from '../../../../shared/models/videos'
+import * as chai from 'chai'
+import { readdir } from 'fs-extra'
+import * as magnetUtil from 'magnet-uri'
+import { join } from 'path'
+import { HttpStatusCode } from '@shared/core-utils'
import {
checkSegmentHash,
checkVideoFilesWereRemoved,
cleanupTests,
doubleFollow,
flushAndRunMultipleServers,
- getFollowingListPaginationAndSort,
getVideo,
getVideoWithToken,
immutableAssign,
root,
ServerInfo,
setAccessTokensToServers,
- unfollow,
- updateCustomConfig,
- updateCustomSubConfig,
+ updateVideo,
uploadVideo,
viewVideo,
wait,
+ waitJobs,
waitUntilLog
-} from '../../../../shared/extra-utils'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
-
-import * as magnetUtil from 'magnet-uri'
-import {
- addVideoRedundancy,
- listVideoRedundancies,
- removeVideoRedundancy,
- updateRedundancy
-} from '../../../../shared/extra-utils/server/redundancy'
-import { ActorFollow } from '../../../../shared/models/actors'
-import { readdir } from 'fs-extra'
-import { join } from 'path'
-import { VideoRedundancy, VideoRedundancyStrategy, VideoRedundancyStrategyWithManual } from '../../../../shared/models/redundancy'
-import { getStats } from '../../../../shared/extra-utils/server/stats'
-import { ServerStats } from '../../../../shared/models/server/server-stats.model'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+} from '@shared/extra-utils'
+import { VideoDetails, VideoPrivacy, VideoRedundancyStrategy, VideoRedundancyStrategyWithManual } from '@shared/models'
const expect = chai.expect
statsLength = 2
}
- const res = await getStats(servers[0].url)
- const data: ServerStats = res.body
-
+ const data = await servers[0].statsCommand.get()
expect(data.videosRedundancy).to.have.lengthOf(statsLength)
const stat = data.videosRedundancy[0]
return stat
}
-async function checkStatsWith1Redundancy (strategy: VideoRedundancyStrategyWithManual) {
+async function checkStatsWith1Redundancy (strategy: VideoRedundancyStrategyWithManual, onlyHls = false) {
const stat = await checkStatsGlobal(strategy)
expect(stat.totalUsed).to.be.at.least(1).and.below(409601)
- expect(stat.totalVideoFiles).to.equal(4)
+ expect(stat.totalVideoFiles).to.equal(onlyHls ? 4 : 8)
expect(stat.totalVideos).to.equal(1)
}
expect(stat.totalVideos).to.equal(0)
}
-async function enableRedundancyOnServer1 () {
- await updateRedundancy(servers[0].url, servers[0].accessToken, servers[1].host, true)
-
- const res = await getFollowingListPaginationAndSort({ url: servers[0].url, start: 0, count: 5, sort: '-createdAt' })
- const follows: ActorFollow[] = res.body.data
+async function findServerFollows () {
+ const body = await servers[0].followsCommand.getFollowings({ start: 0, count: 5, sort: '-createdAt' })
+ const follows = body.data
const server2 = follows.find(f => f.following.host === `localhost:${servers[1].port}`)
const server3 = follows.find(f => f.following.host === `localhost:${servers[2].port}`)
+ return { server2, server3 }
+}
+
+async function enableRedundancyOnServer1 () {
+ await servers[0].redundancyCommand.updateRedundancy({ host: servers[1].host, redundancyAllowed: true })
+
+ const { server2, server3 } = await findServerFollows()
+
expect(server3).to.not.be.undefined
expect(server3.following.hostRedundancyAllowed).to.be.false
}
async function disableRedundancyOnServer1 () {
- await updateRedundancy(servers[0].url, servers[0].accessToken, servers[1].host, false)
+ await servers[0].redundancyCommand.updateRedundancy({ host: servers[1].host, redundancyAllowed: false })
- const res = await getFollowingListPaginationAndSort({ url: servers[0].url, start: 0, count: 5, sort: '-createdAt' })
- const follows: ActorFollow[] = res.body.data
- const server2 = follows.find(f => f.following.host === `localhost:${servers[1].port}`)
- const server3 = follows.find(f => f.following.host === `localhost:${servers[2].port}`)
+ const { server2, server3 } = await findServerFollows()
expect(server3).to.not.be.undefined
expect(server3.following.hostRedundancyAllowed).to.be.false
it('Should unfollow on server 1 and remove duplicated videos', async function () {
this.timeout(80000)
- await unfollow(servers[0].url, servers[0].accessToken, servers[1])
+ await servers[0].followsCommand.unfollow({ target: servers[1] })
await waitJobs(servers)
await wait(5000)
await waitJobs(servers)
await check1PlaylistRedundancies()
- await checkStatsWith1Redundancy(strategy)
+ await checkStatsWith1Redundancy(strategy, true)
})
it('Should remove the video and the redundancy files', async function () {
await checkVideoFilesWereRemoved(video1Server2UUID, server.internalServerNumber)
}
})
+
+ after(async function () {
+ await cleanupTests(servers)
+ })
})
describe('With manual strategy', function () {
})
it('Should create a redundancy on first video', async function () {
- await addVideoRedundancy({
- url: servers[0].url,
- accessToken: servers[0].accessToken,
- videoId: video1Server2Id
- })
+ await servers[0].redundancyCommand.addVideo({ videoId: video1Server2Id })
})
it('Should have 2 webseeds on the first video', async function () {
it('Should manually remove redundancies on server 1 and remove duplicated videos', async function () {
this.timeout(80000)
- const res = await listVideoRedundancies({
- url: servers[0].url,
- accessToken: servers[0].accessToken,
- target: 'remote-videos'
- })
+ const body = await servers[0].redundancyCommand.listVideos({ target: 'remote-videos' })
- const videos = res.body.data as VideoRedundancy[]
+ const videos = body.data
expect(videos).to.have.lengthOf(1)
const video = videos[0]
+
for (const r of video.redundancies.files.concat(video.redundancies.streamingPlaylists)) {
- await removeVideoRedundancy({
- url: servers[0].url,
- accessToken: servers[0].accessToken,
- redundancyId: r.id
- })
+ await servers[0].redundancyCommand.removeVideo({ redundancyId: r.id })
}
await waitJobs(servers)
await waitUntilLog(servers[0], 'Duplicated ', 5)
await waitJobs(servers)
- await check2Webseeds()
- await check1PlaylistRedundancies()
+ await check2Webseeds(video1Server2UUID)
+ await check1PlaylistRedundancies(video1Server2UUID)
await checkStatsWith1Redundancy(strategy)
- const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video 2 server 2' })
+ const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video 2 server 2', privacy: VideoPrivacy.PRIVATE })
video2Server2UUID = res.body.video.uuid
+
+ // Wait transcoding before federation
+ await waitJobs(servers)
+
+ await updateVideo(servers[1].url, servers[1].accessToken, video2Server2UUID, { privacy: VideoPrivacy.PUBLIC })
})
it('Should cache video 2 webseeds on the first video', async function () {
try {
await check1WebSeed(video1Server2UUID)
await check0PlaylistRedundancies(video1Server2UUID)
+
await check2Webseeds(video2Server2UUID)
await check1PlaylistRedundancies(video2Server2UUID)
projects / github / Chocobozzz / PeerTube.git / blobdiff