X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fci.sh;h=8fdbe8f26ad1c89cf31ffc11f599a74e6ed5977e;hb=e7a2385480fec9b67970bac1edfd4c8ef0008ebf;hp=5f1230d33c0f6752813ca4a82af50d10d54cf966;hpb=ab4b8974997777373a6032073f9c1aaf33ba9931;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 5f1230d33..8fdbe8f26 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -8,6 +8,7 @@ if [ $# -eq 0 ]; then
 fi
 
 retries=3
+speedFactor="${2:-1}"
 
 runTest () {
     jobname=$1
@@ -26,7 +27,7 @@ runTest () {
         "echo Trying {} >> $joblog; npm run mocha -- -c --timeout 30000 --exit --bail {}" \
         ::: $files
 
-    cat "$joblog" | uniq -c
+    cat "$joblog" | sort | uniq -c
     rm "$joblog"
 }
 
@@ -50,10 +51,10 @@ elif [ "$1" = "client" ]; then
     helperFiles=$(findTestFiles ./dist/server/tests/helpers)
     libFiles=$(findTestFiles ./dist/server/tests/lib)
     miscFiles="./dist/server/tests/client.js ./dist/server/tests/misc-endpoints.js"
-    # Not in plugin task, it needs an index.html
-    pluginFiles="./dist/server/tests/plugins/html-injection.js"
+    # Not in their own task, they need an index.html
+    pluginFiles="./dist/server/tests/plugins/html-injection.js ./dist/server/tests/api/server/plugins.js"
 
-    MOCHA_PARALLEL=true runTest "$1" 2 $feedsFiles $helperFiles $miscFiles $pluginFiles $libFiles
+    MOCHA_PARALLEL=true runTest "$1" $((2*$speedFactor)) $feedsFiles $helperFiles $miscFiles $pluginFiles $libFiles
 elif [ "$1" = "cli-plugin" ]; then
     npm run build:server
     npm run setup:cli
@@ -61,7 +62,7 @@ elif [ "$1" = "cli-plugin" ]; then
     pluginsFiles=$(findTestFiles ./dist/server/tests/plugins html-injection.js)
     cliFiles=$(findTestFiles ./dist/server/tests/cli)
 
-    MOCHA_PARALLEL=true runTest "$1" 2 $pluginsFiles
+    MOCHA_PARALLEL=true runTest "$1" $((2*$speedFactor)) $pluginsFiles
     runTest "$1" 1 $cliFiles
 elif [ "$1" = "api-1" ]; then
     npm run build:server
@@ -70,21 +71,22 @@ elif [ "$1" = "api-1" ]; then
     notificationsFiles=$(findTestFiles ./dist/server/tests/api/notifications)
     searchFiles=$(findTestFiles ./dist/server/tests/api/search)
 
-    MOCHA_PARALLEL=true runTest "$1" 3 $notificationsFiles $searchFiles $checkParamFiles
+    MOCHA_PARALLEL=true runTest "$1" $((3*$speedFactor)) $notificationsFiles $searchFiles $checkParamFiles
 elif [ "$1" = "api-2" ]; then
     npm run build:server
 
     liveFiles=$(findTestFiles ./dist/server/tests/api/live)
-    serverFiles=$(findTestFiles ./dist/server/tests/api/server)
+    serverFiles=$(findTestFiles ./dist/server/tests/api/server plugins.js)
     usersFiles=$(findTestFiles ./dist/server/tests/api/users)
 
-    MOCHA_PARALLEL=true runTest "$1" 3 $liveFiles $serverFiles $usersFiles
+    MOCHA_PARALLEL=true runTest "$1" $((3*$speedFactor)) $liveFiles $serverFiles $usersFiles
 elif [ "$1" = "api-3" ]; then
     npm run build:server
 
     videosFiles=$(findTestFiles ./dist/server/tests/api/videos)
+    viewsFiles=$(findTestFiles ./dist/server/tests/api/views)
 
-    MOCHA_PARALLEL=true runTest "$1" 3 $videosFiles
+    MOCHA_PARALLEL=true runTest "$1" $((3*$speedFactor)) $viewsFiles $videosFiles
 elif [ "$1" = "api-4" ]; then
     npm run build:server
 
@@ -93,13 +95,13 @@ elif [ "$1" = "api-4" ]; then
     objectStorageFiles=$(findTestFiles ./dist/server/tests/api/object-storage)
     activitypubFiles=$(findTestFiles ./dist/server/tests/api/activitypub)
 
-    MOCHA_PARALLEL=true runTest "$1" 2 $moderationFiles $redundancyFiles $activitypubFiles $objectStorageFiles
+    MOCHA_PARALLEL=true runTest "$1" $((2*$speedFactor)) $moderationFiles $redundancyFiles $activitypubFiles $objectStorageFiles
 elif [ "$1" = "api-5" ]; then
     npm run build:server
 
     transcodingFiles=$(findTestFiles ./dist/server/tests/api/transcoding)
 
-    MOCHA_PARALLEL=true runTest "$1" 2 $transcodingFiles
+    MOCHA_PARALLEL=true runTest "$1" $((2*$speedFactor)) $transcodingFiles
 elif [ "$1" = "external-plugins" ]; then
     npm run build:server