diff options
Diffstat (limited to 'server/tests/shared')
-rw-r--r-- | server/tests/shared/generate.ts | 8 | ||||
-rw-r--r-- | server/tests/shared/videos.ts | 13 |
2 files changed, 16 insertions, 5 deletions
diff --git a/server/tests/shared/generate.ts b/server/tests/shared/generate.ts index f806df2f5..9a57084e4 100644 --- a/server/tests/shared/generate.ts +++ b/server/tests/shared/generate.ts | |||
@@ -3,12 +3,12 @@ import ffmpeg from 'fluent-ffmpeg' | |||
3 | import { ensureDir, pathExists } from 'fs-extra' | 3 | import { ensureDir, pathExists } from 'fs-extra' |
4 | import { dirname } from 'path' | 4 | import { dirname } from 'path' |
5 | import { buildAbsoluteFixturePath, getMaxBitrate } from '@shared/core-utils' | 5 | import { buildAbsoluteFixturePath, getMaxBitrate } from '@shared/core-utils' |
6 | import { getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '@shared/extra-utils' | 6 | import { getVideoStreamBitrate, getVideoStreamFPS, getVideoStreamDimensionsInfo } from '@shared/extra-utils' |
7 | 7 | ||
8 | async function ensureHasTooBigBitrate (fixturePath: string) { | 8 | async function ensureHasTooBigBitrate (fixturePath: string) { |
9 | const bitrate = await getVideoFileBitrate(fixturePath) | 9 | const bitrate = await getVideoStreamBitrate(fixturePath) |
10 | const dataResolution = await getVideoFileResolution(fixturePath) | 10 | const dataResolution = await getVideoStreamDimensionsInfo(fixturePath) |
11 | const fps = await getVideoFileFPS(fixturePath) | 11 | const fps = await getVideoStreamFPS(fixturePath) |
12 | 12 | ||
13 | const maxBitrate = getMaxBitrate({ ...dataResolution, fps }) | 13 | const maxBitrate = getMaxBitrate({ ...dataResolution, fps }) |
14 | expect(bitrate).to.be.above(maxBitrate) | 14 | expect(bitrate).to.be.above(maxBitrate) |
diff --git a/server/tests/shared/videos.ts b/server/tests/shared/videos.ts index 6be094f2b..989865a49 100644 --- a/server/tests/shared/videos.ts +++ b/server/tests/shared/videos.ts | |||
@@ -240,6 +240,16 @@ async function uploadRandomVideoOnServers ( | |||
240 | return res | 240 | return res |
241 | } | 241 | } |
242 | 242 | ||
243 | function getAllFiles (video: VideoDetails) { | ||
244 | const files = video.files | ||
245 | |||
246 | if (video.streamingPlaylists[0]) { | ||
247 | return files.concat(video.streamingPlaylists[0].files) | ||
248 | } | ||
249 | |||
250 | return files | ||
251 | } | ||
252 | |||
243 | // --------------------------------------------------------------------------- | 253 | // --------------------------------------------------------------------------- |
244 | 254 | ||
245 | export { | 255 | export { |
@@ -247,5 +257,6 @@ export { | |||
247 | checkUploadVideoParam, | 257 | checkUploadVideoParam, |
248 | uploadRandomVideoOnServers, | 258 | uploadRandomVideoOnServers, |
249 | checkVideoFilesWereRemoved, | 259 | checkVideoFilesWereRemoved, |
250 | saveVideoInServers | 260 | saveVideoInServers, |
261 | getAllFiles | ||
251 | } | 262 | } |