X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fci.sh;h=486666c6a9a4699a4a2960058318adf2425896a7;hb=5abc96fca2496f33075796db208fccc3543e0f65;hp=7b5c3f2bbdca15c404859d7bb7f3ca1313223eb9;hpb=be7ca0c6b9c51c639bac7d2da94599893e7b1c01;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 7b5c3f2bb..486666c6a 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu
 
@@ -9,38 +9,82 @@ fi
 
 killall -q peertube || true
 
-perl -0777 -i  -pe 's#(proxy:\n\s+enabled: false\n\s+)url: ""#$1url: "'"$PROXY_URL"'"#' config/test.yaml
+retries=3
+jobs=2
+
+runTest () {
+    retries=3
+    jobs=$1
+    shift
+    files=$@
+
+    echo $files
+
+    parallel -t -j $jobs --retries $retries \
+        npm run mocha -- -c --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail \
+        ::: $files
+}
+
+findTestFiles () {
+    find $1 -type f -name "*.ts" | grep -v index.ts | xargs echo
+}
 
 if [ "$1" = "misc" ]; then
-    npm run build -- --light-fr
-    mocha --timeout 5000 --exit --require ts-node/register --require tsconfig-paths/register --bail server/tests/client.ts \
-        server/tests/feeds/index.ts \
-        server/tests/misc-endpoints.ts \
-        server/tests/helpers/index.ts \
-        server/tests/plugins/index.ts
+    npm run build -- --light
+
+    feedsFiles=$(findTestFiles server/tests/feeds)
+    helperFiles=$(findTestFiles server/tests/helpers)
+    pluginsFiles=$(findTestFiles server/tests/plugins)
+    miscFiles="server/tests/client.ts server/tests/misc-endpoints.ts"
+
+    TS_NODE_FILES=true runTest 1 $feedsFiles $helperFiles $pluginsFiles $miscFiles
 elif [ "$1" = "cli" ]; then
     npm run build:server
-    CC=gcc-4.9 CXX=g++-4.9 npm run setup:cli
-    mocha --timeout 5000 --exit --require ts-node/register --require tsconfig-paths/register --bail server/tests/cli/index.ts
+    npm run setup:cli
+
+    cliFiles=$(findTestFiles server/tests/cli)
+
+    runTest 1 $cliFiles
 elif [ "$1" = "api-1" ]; then
     npm run build:server
-    sh ./server/tests/api/ci-1.sh 2
+
+    checkParamFiles=$(findTestFiles server/tests/api/check-params)
+    notificationsFiles=$(findTestFiles server/tests/api/notifications)
+    searchFiles=$(findTestFiles server/tests/api/search)
+
+    MOCHA_PARALLEL=true runTest 2 $notificationsFiles $searchFiles $checkParamFiles
 elif [ "$1" = "api-2" ]; then
     npm run build:server
-    sh ./server/tests/api/ci-2.sh 2
+
+    serverFiles=$(findTestFiles server/tests/api/server)
+    usersFiles=$(findTestFiles server/tests/api/users)
+
+    MOCHA_PARALLEL=true runTest 2 $serverFiles $usersFiles
 elif [ "$1" = "api-3" ]; then
     npm run build:server
-    sh ./server/tests/api/ci-3.sh 2
+
+    videosFiles=$(findTestFiles server/tests/api/videos)
+
+    MOCHA_PARALLEL=true runTest 2 $videosFiles
 elif [ "$1" = "api-4" ]; then
     npm run build:server
-    sh ./server/tests/api/ci-4.sh 2
+
+    activitypubFiles=$(findTestFiles server/tests/api/moderation)
+    redundancyFiles=$(findTestFiles server/tests/api/redundancy)
+    activitypubFiles=$(findTestFiles server/tests/api/activitypub)
+
+    MOCHA_PARALLEL=true TS_NODE_FILES=true runTest 2 $activitypubFiles $redundancyFiles $activitypubFiles
+elif [ "$1" = "external-plugins" ]; then
+    npm run build:server
+
+    externalPluginsFiles=$(findTestFiles server/tests/external-plugins)
+
+    runTest 1 $externalPluginsFiles
 elif [ "$1" = "lint" ]; then
-    npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
+    npm run eslint -- --ext .ts "server/**/*.ts" "shared/**/*.ts" "scripts/**/*.ts"
     npm run swagger-cli -- validate support/doc/api/openapi.yaml
 
     ( cd client
       npm run lint
     )
 fi
-
-git checkout -- config/test.yaml