aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests/api
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-05-15 17:17:14 +0200
committerChocobozzz <me@florianbigard.com>2019-05-15 17:17:14 +0200
commitd183ee9bda2588f07032ca4a2fce58651e684abf (patch)
treec0c709104aa97f1b5472a17e3e0c1436ab2dab06 /server/tests/api
parentf88392cf680c30943f91d79d96e65277dfb0c7f0 (diff)
downloadPeerTube-d183ee9bda2588f07032ca4a2fce58651e684abf.tar.gz
PeerTube-d183ee9bda2588f07032ca4a2fce58651e684abf.tar.zst
PeerTube-d183ee9bda2588f07032ca4a2fce58651e684abf.zip
Don't use parallel tests with test suite 1 and 3
Diffstat (limited to 'server/tests/api')
-rw-r--r--server/tests/api/travis-1.sh2
-rw-r--r--server/tests/api/travis-3.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/server/tests/api/travis-1.sh b/server/tests/api/travis-1.sh
index c9918d58e..db4021b25 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-parallel-tests --max-parallel $1 --timeout 5000 --exit --require ts-node/register --bail \ 9MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \
10 $notificationsFiles $searchFiles $checkParamFiles 10 $notificationsFiles $searchFiles $checkParamFiles
diff --git a/server/tests/api/travis-3.sh b/server/tests/api/travis-3.sh
index c0e558d34..82457222c 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-parallel-tests --max-parallel $1 --timeout 5000 --exit --require ts-node/register --bail \ 7MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \
8 $videosFiles 8 $videosFiles