forks/peertube
1
0
Fork 0
Code Releases Activity

Try to fix playlist tests

Browse source
This commit is contained in:
Chocobozzz 2020-11-18 13:41:27 +01:00
parent 4166caabc6
commit 7f88a58e3f
No known key found for this signature in database
GPG key ID: 583A612D890159BE
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/models/video/video.ts
View file

@ -129,7 +129,6 @@ import { VideoShareModel } from './video-share'
import { VideoStreamingPlaylistModel } from './video-streaming-playlist' import { VideoStreamingPlaylistModel } from './video-streaming-playlist'
import { VideoTagModel } from './video-tag' import { VideoTagModel } from './video-tag'
import { VideoViewModel } from './video-view' import { VideoViewModel } from './video-view'
import { ne } from 'sequelize/types/lib/operators'
export enum ScopeNames { export enum ScopeNames {
AVAILABLE_FOR_LIST_IDS = 'AVAILABLE_FOR_LIST_IDS', AVAILABLE_FOR_LIST_IDS = 'AVAILABLE_FOR_LIST_IDS',

5
server/tests/api/videos/video-playlists.ts
View file

@ -41,6 +41,7 @@ import {
uploadVideo, uploadVideo,
uploadVideoAndGetId, uploadVideoAndGetId,
userLogin, userLogin,
wait,
waitJobs waitJobs
} from '../../../../shared/extra-utils' } from '../../../../shared/extra-utils'
import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model' import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model'
@ -227,6 +228,8 @@ describe('Test video playlists', function () {
}) })
await waitJobs(servers) await waitJobs(servers)
// Processing a playlist by the receiver could be long
await wait(3000)
for (const server of servers) { for (const server of servers) {
const res = await getVideoPlaylistsList(server.url, 0, 5) const res = await getVideoPlaylistsList(server.url, 0, 5)
@ -310,6 +313,7 @@ describe('Test video playlists', function () {
} }
await waitJobs(servers) await waitJobs(servers)
await wait(3000)
for (const server of [ servers[0], servers[1] ]) { for (const server of [ servers[0], servers[1] ]) {
const res = await getVideoPlaylistsList(server.url, 0, 5) const res = await getVideoPlaylistsList(server.url, 0, 5)
@ -451,6 +455,7 @@ describe('Test video playlists', function () {
}) })
await waitJobs(servers) await waitJobs(servers)
await wait(3000)
for (const server of servers) { for (const server of servers) {
const results = [ const results = [