aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/tests/api/live/live-constraints.ts2
-rw-r--r--server/tests/api/live/live.ts6
-rw-r--r--server/tests/peertube-runner/client-cli.ts4
3 files changed, 6 insertions, 6 deletions
diff --git a/server/tests/api/live/live-constraints.ts b/server/tests/api/live/live-constraints.ts
index fabb8798d..59e27cc62 100644
--- a/server/tests/api/live/live-constraints.ts
+++ b/server/tests/api/live/live-constraints.ts
@@ -190,7 +190,7 @@ describe('Test live constraints', function () {
190 }) 190 })
191 191
192 it('Should have max duration limit', async function () { 192 it('Should have max duration limit', async function () {
193 this.timeout(60000) 193 this.timeout(240000)
194 194
195 await servers[0].config.updateCustomSubConfig({ 195 await servers[0].config.updateCustomSubConfig({
196 newConfig: { 196 newConfig: {
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts
index f9b0d257b..592548b52 100644
--- a/server/tests/api/live/live.ts
+++ b/server/tests/api/live/live.ts
@@ -447,7 +447,7 @@ describe('Test live', function () {
447 }) 447 })
448 448
449 it('Should enable transcoding with some resolutions', async function () { 449 it('Should enable transcoding with some resolutions', async function () {
450 this.timeout(120000) 450 this.timeout(240000)
451 451
452 const resolutions = [ 240, 480 ] 452 const resolutions = [ 240, 480 ]
453 await updateConf(resolutions) 453 await updateConf(resolutions)
@@ -499,7 +499,7 @@ describe('Test live', function () {
499 }) 499 })
500 500
501 it('Should enable transcoding with some resolutions and correctly save them', async function () { 501 it('Should enable transcoding with some resolutions and correctly save them', async function () {
502 this.timeout(400_000) 502 this.timeout(500_000)
503 503
504 const resolutions = [ 240, 360, 720 ] 504 const resolutions = [ 240, 360, 720 ]
505 505
@@ -586,7 +586,7 @@ describe('Test live', function () {
586 }) 586 })
587 587
588 it('Should not generate an upper resolution than original file', async function () { 588 it('Should not generate an upper resolution than original file', async function () {
589 this.timeout(400_000) 589 this.timeout(500_000)
590 590
591 const resolutions = [ 240, 480 ] 591 const resolutions = [ 240, 480 ]
592 await updateConf(resolutions) 592 await updateConf(resolutions)
diff --git a/server/tests/peertube-runner/client-cli.ts b/server/tests/peertube-runner/client-cli.ts
index 90bf73ef7..ff70e599f 100644
--- a/server/tests/peertube-runner/client-cli.ts
+++ b/server/tests/peertube-runner/client-cli.ts
@@ -64,8 +64,8 @@ describe('Test peertube-runner program client CLI', function () {
64 }) 64 })
65 65
66 after(async function () { 66 after(async function () {
67 await cleanupTests([ server ])
68
69 peertubeRunner.kill() 67 peertubeRunner.kill()
68
69 await cleanupTests([ server ])
70 }) 70 })
71}) 71})