forks
/
peertube
1
0
Fork 0
Code Releases Activity

Fix lint

This commit is contained in:
Chocobozzz 2021-02-01 16:05:22 +01:00
parent 6d989edc66
commit 5e8dd6e08a
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/middlewares/validators/users.ts
View File

@ -7,7 +7,7 @@ import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-code
import { UserRole } from '../../../shared/models/users' import { UserRole } from '../../../shared/models/users'
import { UserRegister } from '../../../shared/models/users/user-register.model' import { UserRegister } from '../../../shared/models/users/user-register.model'
import { isActorPreferredUsernameValid } from '../../helpers/custom-validators/activitypub/actor' import { isActorPreferredUsernameValid } from '../../helpers/custom-validators/activitypub/actor'
import { exists, isIdOrUUIDValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc' import { isIdOrUUIDValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc'
import { isThemeNameValid } from '../../helpers/custom-validators/plugins' import { isThemeNameValid } from '../../helpers/custom-validators/plugins'
import { import {
isNoInstanceConfigWarningModal, isNoInstanceConfigWarningModal,

15
server/tests/api/redundancy/redundancy.ts
View File

@ -24,6 +24,7 @@ import {
ServerInfo, ServerInfo,
setAccessTokensToServers, setAccessTokensToServers,
unfollow, unfollow,
updateVideo,
uploadVideo, uploadVideo,
viewVideo, viewVideo,
wait, wait,
@ -40,7 +41,7 @@ import { getStats } from '../../../../shared/extra-utils/server/stats'
import { ActorFollow } from '../../../../shared/models/actors' import { ActorFollow } from '../../../../shared/models/actors'
import { VideoRedundancy, VideoRedundancyStrategy, VideoRedundancyStrategyWithManual } from '../../../../shared/models/redundancy' import { VideoRedundancy, VideoRedundancyStrategy, VideoRedundancyStrategyWithManual } from '../../../../shared/models/redundancy'
import { ServerStats } from '../../../../shared/models/server/server-stats.model' import { ServerStats } from '../../../../shared/models/server/server-stats.model'
import { VideoDetails } from '../../../../shared/models/videos' import { VideoDetails, VideoPrivacy } from '../../../../shared/models/videos'
const expect = chai.expect const expect = chai.expect
@ -682,12 +683,17 @@ describe('Test videos redundancy', function () {
await waitUntilLog(servers[0], 'Duplicated ', 5) await waitUntilLog(servers[0], 'Duplicated ', 5)
await waitJobs(servers) await waitJobs(servers)
await check2Webseeds() await check2Webseeds(video1Server2UUID)
await check1PlaylistRedundancies() await check1PlaylistRedundancies(video1Server2UUID)
await checkStatsWith1Redundancy(strategy) await checkStatsWith1Redundancy(strategy)
const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video 2 server 2' }) const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video 2 server 2', privacy: VideoPrivacy.PRIVATE })
video2Server2UUID = res.body.video.uuid video2Server2UUID = res.body.video.uuid
// Wait transcoding before federation
await waitJobs(servers)
await updateVideo(servers[1].url, servers[1].accessToken, video2Server2UUID, { privacy: VideoPrivacy.PUBLIC })
}) })
it('Should cache video 2 webseeds on the first video', async function () { it('Should cache video 2 webseeds on the first video', async function () {
@ -703,6 +709,7 @@ describe('Test videos redundancy', function () {
try { try {
await check1WebSeed(video1Server2UUID) await check1WebSeed(video1Server2UUID)
await check0PlaylistRedundancies(video1Server2UUID) await check0PlaylistRedundancies(video1Server2UUID)
await check2Webseeds(video2Server2UUID) await check2Webseeds(video2Server2UUID)
await check1PlaylistRedundancies(video2Server2UUID) await check1PlaylistRedundancies(video2Server2UUID)