OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix redundancy tests

pull/2027/head
Chocobozzz 2019-08-13 10:22:54 +02:00
parent fb1b0ed9f7
commit 9e3e3617dc
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/models/redundancy/video-redundancy.ts
View File

@ -237,6 +237,8 @@ export class VideoRedundancyModel extends Model<VideoRedundancyModel> {
static async getVideoSample (p: Bluebird<VideoModel[]>) { static async getVideoSample (p: Bluebird<VideoModel[]>) {
const rows = await p const rows = await p
if (rows.length === 0) return undefined
const ids = rows.map(r => r.id) const ids = rows.map(r => r.id)
const id = sample(ids) const id = sample(ids)
@ -347,6 +349,7 @@ export class VideoRedundancyModel extends Model<VideoRedundancyModel> {
required: true, required: true,
include: [ include: [
{ {
required: true,
attributes: [], attributes: [],
model: VideoStreamingPlaylistModel.unscoped(), model: VideoStreamingPlaylistModel.unscoped(),
include: [ include: [

8
server/tests/api/redundancy/redundancy.ts
View File

@ -66,7 +66,7 @@ async function flushAndRunServers (strategy: VideoRedundancyStrategy, additional
immutableAssign({ immutableAssign({
min_lifetime: '1 hour', min_lifetime: '1 hour',
strategy: strategy, strategy: strategy,
size: '200KB' size: '400KB'
}, additionalParams) }, additionalParams)
] ]
} }
@ -224,8 +224,8 @@ async function checkStatsWith2Webseed (strategy: VideoRedundancyStrategy) {
const stat = data.videosRedundancy[0] const stat = data.videosRedundancy[0]
expect(stat.strategy).to.equal(strategy) expect(stat.strategy).to.equal(strategy)
expect(stat.totalSize).to.equal(204800) expect(stat.totalSize).to.equal(409600)
expect(stat.totalUsed).to.be.at.least(1).and.below(204801) expect(stat.totalUsed).to.be.at.least(1).and.below(409601)
expect(stat.totalVideoFiles).to.equal(4) expect(stat.totalVideoFiles).to.equal(4)
expect(stat.totalVideos).to.equal(1) expect(stat.totalVideos).to.equal(1)
} }
@ -238,7 +238,7 @@ async function checkStatsWith1Webseed (strategy: VideoRedundancyStrategy) {
const stat = data.videosRedundancy[0] const stat = data.videosRedundancy[0]
expect(stat.strategy).to.equal(strategy) expect(stat.strategy).to.equal(strategy)
expect(stat.totalSize).to.equal(204800) expect(stat.totalSize).to.equal(409600)
expect(stat.totalUsed).to.equal(0) expect(stat.totalUsed).to.equal(0)
expect(stat.totalVideoFiles).to.equal(0) expect(stat.totalVideoFiles).to.equal(0)
expect(stat.totalVideos).to.equal(0) expect(stat.totalVideos).to.equal(0)