diff options
Diffstat (limited to 'server/tests/plugins')
-rw-r--r-- | server/tests/plugins/filter-hooks.ts | 8 | ||||
-rw-r--r-- | server/tests/plugins/plugin-transcoding.ts | 10 |
2 files changed, 6 insertions, 12 deletions
diff --git a/server/tests/plugins/filter-hooks.ts b/server/tests/plugins/filter-hooks.ts index 52ba396e5..7adfc1277 100644 --- a/server/tests/plugins/filter-hooks.ts +++ b/server/tests/plugins/filter-hooks.ts | |||
@@ -410,13 +410,7 @@ describe('Test plugin filter hooks', function () { | |||
410 | before(async function () { | 410 | before(async function () { |
411 | this.timeout(60000) | 411 | this.timeout(60000) |
412 | 412 | ||
413 | await servers[0].config.updateCustomSubConfig({ | 413 | await servers[0].config.disableTranscoding() |
414 | newConfig: { | ||
415 | transcoding: { | ||
416 | enabled: false | ||
417 | } | ||
418 | } | ||
419 | }) | ||
420 | 414 | ||
421 | for (const name of [ 'bad embed', 'good embed' ]) { | 415 | for (const name of [ 'bad embed', 'good embed' ]) { |
422 | { | 416 | { |
diff --git a/server/tests/plugins/plugin-transcoding.ts b/server/tests/plugins/plugin-transcoding.ts index 5ab686472..49569f1fa 100644 --- a/server/tests/plugins/plugin-transcoding.ts +++ b/server/tests/plugins/plugin-transcoding.ts | |||
@@ -2,7 +2,8 @@ | |||
2 | 2 | ||
3 | import 'mocha' | 3 | import 'mocha' |
4 | import { expect } from 'chai' | 4 | import { expect } from 'chai' |
5 | import { getAudioStream, getVideoFileFPS, getVideoStreamFromFile } from '@server/helpers/ffprobe-utils' | 5 | import { getAudioStream, getVideoStreamFPS, getVideoStream } from '@server/helpers/ffmpeg' |
6 | import { VideoPrivacy } from '@shared/models' | ||
6 | import { | 7 | import { |
7 | cleanupTests, | 8 | cleanupTests, |
8 | createSingleServer, | 9 | createSingleServer, |
@@ -13,7 +14,6 @@ import { | |||
13 | testFfmpegStreamError, | 14 | testFfmpegStreamError, |
14 | waitJobs | 15 | waitJobs |
15 | } from '@shared/server-commands' | 16 | } from '@shared/server-commands' |
16 | import { VideoPrivacy } from '@shared/models' | ||
17 | 17 | ||
18 | async function createLiveWrapper (server: PeerTubeServer) { | 18 | async function createLiveWrapper (server: PeerTubeServer) { |
19 | const liveAttributes = { | 19 | const liveAttributes = { |
@@ -92,7 +92,7 @@ describe('Test transcoding plugins', function () { | |||
92 | 92 | ||
93 | async function checkLiveFPS (uuid: string, type: 'above' | 'below', fps: number) { | 93 | async function checkLiveFPS (uuid: string, type: 'above' | 'below', fps: number) { |
94 | const playlistUrl = `${server.url}/static/streaming-playlists/hls/${uuid}/0.m3u8` | 94 | const playlistUrl = `${server.url}/static/streaming-playlists/hls/${uuid}/0.m3u8` |
95 | const videoFPS = await getVideoFileFPS(playlistUrl) | 95 | const videoFPS = await getVideoStreamFPS(playlistUrl) |
96 | 96 | ||
97 | if (type === 'above') { | 97 | if (type === 'above') { |
98 | expect(videoFPS).to.be.above(fps) | 98 | expect(videoFPS).to.be.above(fps) |
@@ -252,7 +252,7 @@ describe('Test transcoding plugins', function () { | |||
252 | const audioProbe = await getAudioStream(path) | 252 | const audioProbe = await getAudioStream(path) |
253 | expect(audioProbe.audioStream.codec_name).to.equal('opus') | 253 | expect(audioProbe.audioStream.codec_name).to.equal('opus') |
254 | 254 | ||
255 | const videoProbe = await getVideoStreamFromFile(path) | 255 | const videoProbe = await getVideoStream(path) |
256 | expect(videoProbe.codec_name).to.equal('vp9') | 256 | expect(videoProbe.codec_name).to.equal('vp9') |
257 | }) | 257 | }) |
258 | 258 | ||
@@ -269,7 +269,7 @@ describe('Test transcoding plugins', function () { | |||
269 | const audioProbe = await getAudioStream(playlistUrl) | 269 | const audioProbe = await getAudioStream(playlistUrl) |
270 | expect(audioProbe.audioStream.codec_name).to.equal('opus') | 270 | expect(audioProbe.audioStream.codec_name).to.equal('opus') |
271 | 271 | ||
272 | const videoProbe = await getVideoStreamFromFile(playlistUrl) | 272 | const videoProbe = await getVideoStream(playlistUrl) |
273 | expect(videoProbe.codec_name).to.equal('h264') | 273 | expect(videoProbe.codec_name).to.equal('h264') |
274 | }) | 274 | }) |
275 | }) | 275 | }) |