forks
/
peertube
1
0
Fork 0
Code Releases Activity

Merge branch 'release/3.2.0' into develop

This commit is contained in:
Chocobozzz 2021-05-25 13:14:34 +02:00
parent c4d125527a fc8f15d202
commit 819b656439
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/tests/plugins/plugin-transcoding.ts
View File

@ -125,7 +125,7 @@ describe('Test transcoding plugins', function () {
})
it('Should not use the plugin profile if not chosen by the admin', async function () {
this.timeout(120000)
this.timeout(240000)
const videoUUID = (await uploadVideoAndGetId({ server, videoName: 'video' })).uuid
await waitJobs([ server ])
@ -134,7 +134,7 @@ describe('Test transcoding plugins', function () {
})
it('Should use the vod profile', async function () {
this.timeout(120000)
this.timeout(240000)
await updateConf(server, 'low-vod', 'default')
@ -145,7 +145,7 @@ describe('Test transcoding plugins', function () {
})
it('Should apply input options in vod profile', async function () {
this.timeout(120000)
this.timeout(240000)
await updateConf(server, 'input-options-vod', 'default')
@ -156,7 +156,7 @@ describe('Test transcoding plugins', function () {
})
it('Should apply the scale filter in vod profile', async function () {
this.timeout(120000)
this.timeout(240000)
await updateConf(server, 'bad-scale-vod', 'default')
@ -172,7 +172,7 @@ describe('Test transcoding plugins', function () {
})
it('Should not use the plugin profile if not chosen by the admin', async function () {
this.timeout(120000)
this.timeout(240000)
const liveVideoId = await createLiveWrapper(server)
@ -184,7 +184,7 @@ describe('Test transcoding plugins', function () {
})
it('Should use the live profile', async function () {
this.timeout(120000)
this.timeout(240000)
await updateConf(server, 'low-vod', 'low-live')
@ -198,7 +198,7 @@ describe('Test transcoding plugins', function () {
})
it('Should apply the input options on live profile', async function () {
this.timeout(120000)
this.timeout(240000)
await updateConf(server, 'low-vod', 'input-options-live')
@ -212,7 +212,7 @@ describe('Test transcoding plugins', function () {
})
it('Should apply the scale filter name on live profile', async function () {
this.timeout(120000)
this.timeout(240000)
await updateConf(server, 'low-vod', 'bad-scale-live')
@ -223,7 +223,7 @@ describe('Test transcoding plugins', function () {
})
it('Should default to the default profile if the specified profile does not exist', async function () {
this.timeout(120000)
this.timeout(240000)
await uninstallPlugin({ url: server.url, accessToken: server.accessToken, npmName: 'peertube-plugin-test-transcoding-one' })
@ -268,7 +268,7 @@ describe('Test transcoding plugins', function () {
})
it('Should use the new live encoders', async function () {
this.timeout(120000)
this.timeout(240000)
const liveVideoId = await createLiveWrapper(server)