aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-03-17 10:50:26 +0100
committerChocobozzz <me@florianbigard.com>2022-03-17 10:50:26 +0100
commitdb1ccd05d349c400c658dec68d11c8b01c9ccd01 (patch)
tree71a24e2c3a61d1f1f3f53937f21271710ca5212c
parent2769876fb26742f5cc8aa4b761be7bafca97d18d (diff)
downloadPeerTube-db1ccd05d349c400c658dec68d11c8b01c9ccd01.tar.gz
PeerTube-db1ccd05d349c400c658dec68d11c8b01c9ccd01.tar.zst
PeerTube-db1ccd05d349c400c658dec68d11c8b01c9ccd01.zip
Fix CI
-rwxr-xr-xscripts/ci.sh6
-rw-r--r--server/tests/api/server/jobs.ts3
2 files changed, 4 insertions, 5 deletions
diff --git a/scripts/ci.sh b/scripts/ci.sh
index 5f1230d33..3d23f0297 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -50,8 +50,8 @@ elif [ "$1" = "client" ]; then
50 helperFiles=$(findTestFiles ./dist/server/tests/helpers) 50 helperFiles=$(findTestFiles ./dist/server/tests/helpers)
51 libFiles=$(findTestFiles ./dist/server/tests/lib) 51 libFiles=$(findTestFiles ./dist/server/tests/lib)
52 miscFiles="./dist/server/tests/client.js ./dist/server/tests/misc-endpoints.js" 52 miscFiles="./dist/server/tests/client.js ./dist/server/tests/misc-endpoints.js"
53 # Not in plugin task, it needs an index.html 53 # Not in their own task, they need an index.html
54 pluginFiles="./dist/server/tests/plugins/html-injection.js" 54 pluginFiles="./dist/server/tests/plugins/html-injection.js ./dist/server/tests/api/server/plugins.js"
55 55
56 MOCHA_PARALLEL=true runTest "$1" 2 $feedsFiles $helperFiles $miscFiles $pluginFiles $libFiles 56 MOCHA_PARALLEL=true runTest "$1" 2 $feedsFiles $helperFiles $miscFiles $pluginFiles $libFiles
57elif [ "$1" = "cli-plugin" ]; then 57elif [ "$1" = "cli-plugin" ]; then
@@ -75,7 +75,7 @@ elif [ "$1" = "api-2" ]; then
75 npm run build:server 75 npm run build:server
76 76
77 liveFiles=$(findTestFiles ./dist/server/tests/api/live) 77 liveFiles=$(findTestFiles ./dist/server/tests/api/live)
78 serverFiles=$(findTestFiles ./dist/server/tests/api/server) 78 serverFiles=$(findTestFiles ./dist/server/tests/api/server plugins.js)
79 usersFiles=$(findTestFiles ./dist/server/tests/api/users) 79 usersFiles=$(findTestFiles ./dist/server/tests/api/users)
80 80
81 MOCHA_PARALLEL=true runTest "$1" 3 $liveFiles $serverFiles $usersFiles 81 MOCHA_PARALLEL=true runTest "$1" 3 $liveFiles $serverFiles $usersFiles
diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts
index 6cc88a123..96ab2a576 100644
--- a/server/tests/api/server/jobs.ts
+++ b/server/tests/api/server/jobs.ts
@@ -3,6 +3,7 @@
3import 'mocha' 3import 'mocha'
4import * as chai from 'chai' 4import * as chai from 'chai'
5import { dateIsValid } from '@server/tests/shared' 5import { dateIsValid } from '@server/tests/shared'
6import { wait } from '@shared/core-utils'
6import { 7import {
7 cleanupTests, 8 cleanupTests,
8 createMultipleServers, 9 createMultipleServers,
@@ -11,8 +12,6 @@ import {
11 setAccessTokensToServers, 12 setAccessTokensToServers,
12 waitJobs 13 waitJobs
13} from '@shared/server-commands' 14} from '@shared/server-commands'
14import { wait } from '@shared/core-utils'
15import { uuid } from 'short-uuid'
16 15
17const expect = chai.expect 16const expect = chai.expect
18 17