aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-07-30 15:34:00 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-07-31 11:32:04 +0200
commitf4659d73fb2d81c9a8f8d1f592ca873b622a194b (patch)
tree0aabe83d9c250c2e2951c50857d79faf2b582b4a /scripts
parentf0af38e69677d1afe17e48b3f5267128db3db1a4 (diff)
downloadPeerTube-f4659d73fb2d81c9a8f8d1f592ca873b622a194b.tar.gz
PeerTube-f4659d73fb2d81c9a8f8d1f592ca873b622a194b.tar.zst
PeerTube-f4659d73fb2d81c9a8f8d1f592ca873b622a194b.zip
Don't run in parallel cli and plugin tests
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ci.sh12
-rwxr-xr-xscripts/reset-password.ts2
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/ci.sh b/scripts/ci.sh
index 448c1c91f..bf34cd337 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -20,7 +20,7 @@ runTest () {
20 20
21 echo $files 21 echo $files
22 22
23 MOCHA_PARALLEL=true parallel -t -j $jobs --retries $retries \ 23 parallel -t -j $jobs --retries $retries \
24 npm run mocha -- -c --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail \ 24 npm run mocha -- -c --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail \
25 ::: $files 25 ::: $files
26} 26}
@@ -35,9 +35,9 @@ if [ "$1" = "misc" ]; then
35 feedsFiles=$(findTestFiles server/tests/feeds) 35 feedsFiles=$(findTestFiles server/tests/feeds)
36 helperFiles=$(findTestFiles server/tests/helpers) 36 helperFiles=$(findTestFiles server/tests/helpers)
37 pluginsFiles=$(findTestFiles server/tests/plugins) 37 pluginsFiles=$(findTestFiles server/tests/plugins)
38 miscFiles=server/tests/client.ts server/tests/misc-endpoints.ts 38 miscFiles="server/tests/client.ts server/tests/misc-endpoints.ts"
39 39
40 TS_NODE_FILES=true runTest 2 $feedsFiles $helperFiles $pluginsFiles $miscFiles 40 TS_NODE_FILES=true MOCHA_PARALLEL=true runTest 2 $feedsFiles $helperFiles $pluginsFiles $miscFiles
41elif [ "$1" = "cli" ]; then 41elif [ "$1" = "cli" ]; then
42 npm run build:server 42 npm run build:server
43 npm run setup:cli 43 npm run setup:cli
@@ -52,14 +52,14 @@ elif [ "$1" = "api-1" ]; then
52 notificationsFiles=$(findTestFiles server/tests/api/notifications) 52 notificationsFiles=$(findTestFiles server/tests/api/notifications)
53 searchFiles=$(findTestFiles server/tests/api/search) 53 searchFiles=$(findTestFiles server/tests/api/search)
54 54
55 runTest 2 $notificationsFiles $searchFiles $checkParamFiles 55 MOCHA_PARALLEL=true runTest 2 $notificationsFiles $searchFiles $checkParamFiles
56elif [ "$1" = "api-2" ]; then 56elif [ "$1" = "api-2" ]; then
57 npm run build:server 57 npm run build:server
58 58
59 serverFiles=$(findTestFiles server/tests/api/server) 59 serverFiles=$(findTestFiles server/tests/api/server)
60 usersFiles=$(findTestFiles server/tests/api/users) 60 usersFiles=$(findTestFiles server/tests/api/users)
61 61
62 runTest 2 $serverFiles $usersFiles 62 MOCHA_PARALLEL=true runTest 2 $serverFiles $usersFiles
63elif [ "$1" = "api-3" ]; then 63elif [ "$1" = "api-3" ]; then
64 npm run build:server 64 npm run build:server
65 65
@@ -73,7 +73,7 @@ elif [ "$1" = "api-4" ]; then
73 redundancyFiles=$(findTestFiles server/tests/api/redundancy) 73 redundancyFiles=$(findTestFiles server/tests/api/redundancy)
74 activitypubFiles=$(findTestFiles server/tests/api/activitypub) 74 activitypubFiles=$(findTestFiles server/tests/api/activitypub)
75 75
76 TS_NODE_FILES=true runTest 2 $activitypubFiles $redundancyFiles $activitypubFiles 76 MOCHA_PARALLEL=true TS_NODE_FILES=true runTest 2 $activitypubFiles $redundancyFiles $activitypubFiles
77elif [ "$1" = "external-plugins" ]; then 77elif [ "$1" = "external-plugins" ]; then
78 npm run build:server 78 npm run build:server
79 79
diff --git a/scripts/reset-password.ts b/scripts/reset-password.ts
index bf6535cea..6372095d6 100755
--- a/scripts/reset-password.ts
+++ b/scripts/reset-password.ts
@@ -21,7 +21,7 @@ initDatabaseModels(true)
21 }) 21 })
22 .then(user => { 22 .then(user => {
23 if (!user) { 23 if (!user) {
24 console.error('User unknown.') 24 console.error('Unknown user.')
25 process.exit(-1) 25 process.exit(-1)
26 } 26 }
27 27