From 7abb5c5da1ed7c6945e81b9e3da0a14f623f69ea Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 30 Jul 2020 14:44:08 +0200 Subject: Use parallel to run tests in parallel --- server/tests/api/ci-1.sh | 10 ---------- server/tests/api/ci-2.sh | 10 ---------- server/tests/api/ci-3.sh | 8 -------- server/tests/api/ci-4.sh | 11 ----------- 4 files changed, 39 deletions(-) delete mode 100644 server/tests/api/ci-1.sh delete mode 100644 server/tests/api/ci-2.sh delete mode 100644 server/tests/api/ci-3.sh delete mode 100644 server/tests/api/ci-4.sh (limited to 'server') diff --git a/server/tests/api/ci-1.sh b/server/tests/api/ci-1.sh deleted file mode 100644 index faa440785..000000000 --- a/server/tests/api/ci-1.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env sh - -set -eu - -checkParamFiles=$(find server/tests/api/check-params -type f | grep -v index.ts | xargs echo) -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 npm run mocha -- --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail \ - $notificationsFiles $searchFiles $checkParamFiles diff --git a/server/tests/api/ci-2.sh b/server/tests/api/ci-2.sh deleted file mode 100644 index 016df1cfc..000000000 --- a/server/tests/api/ci-2.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env sh - -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 npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \ - --require ts-node/register --require tsconfig-paths/register --bail \ - $serverFiles $usersFiles diff --git a/server/tests/api/ci-3.sh b/server/tests/api/ci-3.sh deleted file mode 100644 index ae5bb735a..000000000 --- a/server/tests/api/ci-3.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env sh - -set -eu - -videosFiles=$(find server/tests/api/videos -type f | grep -v index.ts | xargs echo) - -npm run mocha -- --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail \ - $videosFiles diff --git a/server/tests/api/ci-4.sh b/server/tests/api/ci-4.sh deleted file mode 100644 index 4998de364..000000000 --- a/server/tests/api/ci-4.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env sh - -set -eu - -activitypubFiles=$(find server/tests/api/moderation -type f | grep -v index.ts | xargs echo) -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) - -TS_NODE_FILES=true MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \ - --require ts-node/register --require tsconfig-paths/register --bail \ - $redundancyFiles $activitypubFiles -- cgit v1.2.3