aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-07-24 09:21:22 +0200
committerChocobozzz <chocobozzz@cpy.re>2019-07-24 10:58:16 +0200
commit24163420dd43e3429976c8518d1752832ba910a4 (patch)
tree2565a916b4f5c789ff4120828f02b0709754607a /server
parentc9e3eeedad67649d9b7aec8897b738d0ad63ec1f (diff)
downloadPeerTube-24163420dd43e3429976c8518d1752832ba910a4.tar.gz
PeerTube-24163420dd43e3429976c8518d1752832ba910a4.tar.zst
PeerTube-24163420dd43e3429976c8518d1752832ba910a4.zip
Add retries to travis mocha
Diffstat (limited to 'server')
-rw-r--r--server/tests/api/travis-1.sh2
-rw-r--r--server/tests/api/travis-2.sh2
-rw-r--r--server/tests/api/travis-3.sh2
-rw-r--r--server/tests/api/travis-4.sh2
-rw-r--r--server/tests/api/videos/multiple-servers.ts4
5 files changed, 6 insertions, 6 deletions
diff --git a/server/tests/api/travis-1.sh b/server/tests/api/travis-1.sh
index db4021b25..4572416b7 100644
--- a/server/tests/api/travis-1.sh
+++ b/server/tests/api/travis-1.sh
@@ -6,5 +6,5 @@ checkParamFiles=$(find server/tests/api/check-params -type f | grep -v index.ts
6notificationsFiles=$(find server/tests/api/notifications -type f | grep -v index.ts | xargs echo) 6notificationsFiles=$(find server/tests/api/notifications -type f | grep -v index.ts | xargs echo)
7searchFiles=$(find server/tests/api/search -type f | grep -v index.ts | xargs echo) 7searchFiles=$(find server/tests/api/search -type f | grep -v index.ts | xargs echo)
8 8
9MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \ 9MOCHA_PARALLEL=true mocha --timeout 5000 --retries 3 --exit --require ts-node/register --bail \
10 $notificationsFiles $searchFiles $checkParamFiles 10 $notificationsFiles $searchFiles $checkParamFiles
diff --git a/server/tests/api/travis-2.sh b/server/tests/api/travis-2.sh
index ba7a061b0..3c519ef68 100644
--- a/server/tests/api/travis-2.sh
+++ b/server/tests/api/travis-2.sh
@@ -5,5 +5,5 @@ set -eu
5serverFiles=$(find server/tests/api/server -type f | grep -v index.ts | xargs echo) 5serverFiles=$(find server/tests/api/server -type f | grep -v index.ts | xargs echo)
6usersFiles=$(find server/tests/api/users -type f | grep -v index.ts | xargs echo) 6usersFiles=$(find server/tests/api/users -type f | grep -v index.ts | xargs echo)
7 7
8MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \ 8MOCHA_PARALLEL=true mocha --timeout 5000 --retries 3 --exit --require ts-node/register --bail \
9 $serverFiles $usersFiles 9 $serverFiles $usersFiles
diff --git a/server/tests/api/travis-3.sh b/server/tests/api/travis-3.sh
index 82457222c..97dadafca 100644
--- a/server/tests/api/travis-3.sh
+++ b/server/tests/api/travis-3.sh
@@ -4,5 +4,5 @@ set -eu
4 4
5videosFiles=$(find server/tests/api/videos -type f | grep -v index.ts | xargs echo) 5videosFiles=$(find server/tests/api/videos -type f | grep -v index.ts | xargs echo)
6 6
7MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \ 7MOCHA_PARALLEL=true mocha --timeout 5000 --retries 3 --exit --require ts-node/register --bail \
8 $videosFiles 8 $videosFiles
diff --git a/server/tests/api/travis-4.sh b/server/tests/api/travis-4.sh
index 875986182..6009b1f0e 100644
--- a/server/tests/api/travis-4.sh
+++ b/server/tests/api/travis-4.sh
@@ -5,5 +5,5 @@ set -eu
5redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | xargs echo) 5redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | xargs echo)
6activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) 6activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo)
7 7
8MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel $1 --timeout 5000 --exit --require ts-node/register --bail \ 8MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel $1 --timeout 5000 --retries 3 --exit --require ts-node/register --bail \
9 $redundancyFiles $activitypubFiles 9 $redundancyFiles $activitypubFiles
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index e9625e5f7..e811ccd8e 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -533,7 +533,7 @@ describe('Test multiple servers', function () {
533 }) 533 })
534 534
535 it('Should view multiple videos on each servers', async function () { 535 it('Should view multiple videos on each servers', async function () {
536 this.timeout(30000) 536 this.timeout(45000)
537 537
538 const tasks: Promise<any>[] = [] 538 const tasks: Promise<any>[] = []
539 tasks.push(viewVideo(servers[0].url, remoteVideosServer1[0])) 539 tasks.push(viewVideo(servers[0].url, remoteVideosServer1[0]))
@@ -552,7 +552,7 @@ describe('Test multiple servers', function () {
552 await waitJobs(servers) 552 await waitJobs(servers)
553 553
554 // Wait the repeatable job 554 // Wait the repeatable job
555 await wait(8000) 555 await wait(16000)
556 556
557 let baseVideos = null 557 let baseVideos = null
558 558