forks
/
peertube
1
0
Fork 0
Code Releases Activity

Fix CI

This commit is contained in:
Chocobozzz 2022-03-17 10:50:26 +01:00
parent 2769876fb2
commit db1ccd05d3
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/ci.sh
View File

@ -50,8 +50,8 @@ elif [ "$1" = "client" ]; then
helperFiles=$(findTestFiles ./dist/server/tests/helpers) helperFiles=$(findTestFiles ./dist/server/tests/helpers)
libFiles=$(findTestFiles ./dist/server/tests/lib) libFiles=$(findTestFiles ./dist/server/tests/lib)
miscFiles="./dist/server/tests/client.js ./dist/server/tests/misc-endpoints.js" miscFiles="./dist/server/tests/client.js ./dist/server/tests/misc-endpoints.js"
# Not in plugin task, it needs an index.html # Not in their own task, they need an index.html
pluginFiles="./dist/server/tests/plugins/html-injection.js" 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 $feedsFiles $helperFiles $miscFiles $pluginFiles $libFiles
elif [ "$1" = "cli-plugin" ]; then elif [ "$1" = "cli-plugin" ]; then
@ -75,7 +75,7 @@ elif [ "$1" = "api-2" ]; then
npm run build:server npm run build:server
liveFiles=$(findTestFiles ./dist/server/tests/api/live) 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) usersFiles=$(findTestFiles ./dist/server/tests/api/users)
MOCHA_PARALLEL=true runTest "$1" 3 $liveFiles $serverFiles $usersFiles MOCHA_PARALLEL=true runTest "$1" 3 $liveFiles $serverFiles $usersFiles

3
server/tests/api/server/jobs.ts
View File

@ -3,6 +3,7 @@
import 'mocha' import 'mocha'
import * as chai from 'chai' import * as chai from 'chai'
import { dateIsValid } from '@server/tests/shared' import { dateIsValid } from '@server/tests/shared'
import { wait } from '@shared/core-utils'
import { import {
cleanupTests, cleanupTests,
createMultipleServers, createMultipleServers,
@ -11,8 +12,6 @@ import {
setAccessTokensToServers, setAccessTokensToServers,
waitJobs waitJobs
} from '@shared/server-commands' } from '@shared/server-commands'
import { wait } from '@shared/core-utils'
import { uuid } from 'short-uuid'
const expect = chai.expect const expect = chai.expect