From f88392cf680c30943f91d79d96e65277dfb0c7f0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 15 May 2019 15:37:31 +0200 Subject: [PATCH] Decrease max parallel tests for travis --- scripts/travis.sh | 8 ++++---- 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 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/travis.sh b/scripts/travis.sh index 772d3906a..c38bd2cab 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -20,16 +20,16 @@ elif [ "$1" = "cli" ]; then mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/cli/index.ts elif [ "$1" = "api-1" ]; then npm run build:server - sh ./server/tests/api/travis-1.sh + sh ./server/tests/api/travis-1.sh 2 elif [ "$1" = "api-2" ]; then npm run build:server - sh ./server/tests/api/travis-2.sh + sh ./server/tests/api/travis-2.sh 2 elif [ "$1" = "api-3" ]; then npm run build:server - sh ./server/tests/api/travis-3.sh + sh ./server/tests/api/travis-3.sh 2 elif [ "$1" = "api-4" ]; then npm run build:server - sh ./server/tests/api/travis-4.sh + sh ./server/tests/api/travis-4.sh 2 elif [ "$1" = "lint" ]; then npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts" diff --git a/server/tests/api/travis-1.sh b/server/tests/api/travis-1.sh index f7332795c..c9918d58e 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-parallel-tests --max-parallel 3 --timeout 5000 --exit --require ts-node/register --bail \ +MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel $1 --timeout 5000 --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 abeb48144..82c1864b4 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-parallel-tests --max-parallel 3 --timeout 5000 --exit --require ts-node/register --bail \ +MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel $1 --timeout 5000 --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 81e6c2e4b..c0e558d34 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-parallel-tests --max-parallel 3 --timeout 5000 --exit --require ts-node/register --bail \ +MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel $1 --timeout 5000 --exit --require ts-node/register --bail \ $videosFiles diff --git a/server/tests/api/travis-4.sh b/server/tests/api/travis-4.sh index 24bf5b71c..875986182 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 3 --timeout 5000 --exit --require ts-node/register --bail \ +MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel $1 --timeout 5000 --exit --require ts-node/register --bail \ $redundancyFiles $activitypubFiles -- 2.25.1