Decrease max parallel tests for travis

diff --git a/scripts/travis.sh b/scripts/travis.sh
index 772d3906ae2264ab3729b2bffcbd1e7d72693ef9..c38bd2cabc12cfa926cd09822a2f5046ec9e8864 100755 (executable)
--- 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 f7332795c22ab8b34b1f719c6526e28e63fc6114..c9918d58ec39925e912bc5ed9def5ed232733b6a 100644 (file)
--- 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 abeb481444f07edab1c20da51e4448fea9f56781..82c1864b4069ab741de0f077bfbc61ba9ee1aedb 100644 (file)
--- 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 81e6c2e4b232ac0489c674027ed1067ede2f3a5c..c0e558d348aeb2111344bd8ae77ed2793478573f 100644 (file)
--- 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 24bf5b71c8ad9b6118727f241e312d4428272fe6..875986182250af2270e195f6d66f7836d06471bc 100644 (file)
--- 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