From 24163420dd43e3429976c8518d1752832ba910a4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 24 Jul 2019 09:21:22 +0200 Subject: [PATCH] Add retries to travis mocha --- server/tests/api/travis-1.sh | 2 +- server/tests/api/travis-2.sh | 2 +- server/tests/api/travis-3.sh | 2 +- server/tests/api/travis-4.sh | 2 +- server/tests/api/videos/multiple-servers.ts | 4 ++-- 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 notificationsFiles=$(find server/tests/api/notifications -type f | grep -v index.ts | xargs echo) searchFiles=$(find server/tests/api/search -type f | grep -v index.ts | xargs echo) -MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \ +MOCHA_PARALLEL=true mocha --timeout 5000 --retries 3 --exit --require ts-node/register --bail \ $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 serverFiles=$(find server/tests/api/server -type f | grep -v index.ts | xargs echo) usersFiles=$(find server/tests/api/users -type f | grep -v index.ts | xargs echo) -MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \ +MOCHA_PARALLEL=true mocha --timeout 5000 --retries 3 --exit --require ts-node/register --bail \ $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 videosFiles=$(find server/tests/api/videos -type f | grep -v index.ts | xargs echo) -MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \ +MOCHA_PARALLEL=true mocha --timeout 5000 --retries 3 --exit --require ts-node/register --bail \ $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 redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | xargs echo) activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) -MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel $1 --timeout 5000 --exit --require ts-node/register --bail \ +MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel $1 --timeout 5000 --retries 3 --exit --require ts-node/register --bail \ $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 () { }) it('Should view multiple videos on each servers', async function () { - this.timeout(30000) + this.timeout(45000) const tasks: Promise[] = [] tasks.push(viewVideo(servers[0].url, remoteVideosServer1[0])) @@ -552,7 +552,7 @@ describe('Test multiple servers', function () { await waitJobs(servers) // Wait the repeatable job - await wait(8000) + await wait(16000) let baseVideos = null