aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/tests/api/config.ts2
-rw-r--r--server/tests/api/multiple-servers.ts5
2 files changed, 4 insertions, 3 deletions
diff --git a/server/tests/api/config.ts b/server/tests/api/config.ts
index 72a9e5679..61ae57977 100644
--- a/server/tests/api/config.ts
+++ b/server/tests/api/config.ts
@@ -29,6 +29,8 @@ describe('Test config', function () {
29 }) 29 })
30 30
31 it('Should have a correct config on a server with registration enabled and a users limit', async function () { 31 it('Should have a correct config on a server with registration enabled and a users limit', async function () {
32 this.timeout(5000)
33
32 await Promise.all([ 34 await Promise.all([
33 registerUser(server.url, 'user1', 'super password'), 35 registerUser(server.url, 'user1', 'super password'),
34 registerUser(server.url, 'user2', 'super password'), 36 registerUser(server.url, 'user2', 'super password'),
diff --git a/server/tests/api/multiple-servers.ts b/server/tests/api/multiple-servers.ts
index 601e5f39a..7d06e55d1 100644
--- a/server/tests/api/multiple-servers.ts
+++ b/server/tests/api/multiple-servers.ts
@@ -69,8 +69,7 @@ describe('Test multiple servers', function () {
69 69
70 describe('Should upload the video and propagate on each server', function () { 70 describe('Should upload the video and propagate on each server', function () {
71 it('Should upload the video on server 1 and propagate on each server', async function () { 71 it('Should upload the video on server 1 and propagate on each server', async function () {
72 // Server 1 has video transcoding activated 72 this.timeout(25000)
73 this.timeout(15000)
74 73
75 const videoAttributes = { 74 const videoAttributes = {
76 name: 'my super name for server 1', 75 name: 'my super name for server 1',
@@ -85,7 +84,7 @@ describe('Test multiple servers', function () {
85 } 84 }
86 await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes) 85 await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes)
87 86
88 await wait(5000) 87 await wait(10000)
89 88
90 // All servers should have this video 89 // All servers should have this video
91 for (const server of servers) { 90 for (const server of servers) {