diff --git a/server/models/video/video.ts b/server/models/video/video.ts index f1782f78d..edf757697 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -129,7 +129,6 @@ import { VideoShareModel } from './video-share' import { VideoStreamingPlaylistModel } from './video-streaming-playlist' import { VideoTagModel } from './video-tag' import { VideoViewModel } from './video-view' -import { ne } from 'sequelize/types/lib/operators' export enum ScopeNames { AVAILABLE_FOR_LIST_IDS = 'AVAILABLE_FOR_LIST_IDS', diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts index b194665ba..7d1215990 100644 --- a/server/tests/api/videos/video-playlists.ts +++ b/server/tests/api/videos/video-playlists.ts @@ -41,6 +41,7 @@ import { uploadVideo, uploadVideoAndGetId, userLogin, + wait, waitJobs } from '../../../../shared/extra-utils' import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model' @@ -227,6 +228,8 @@ describe('Test video playlists', function () { }) await waitJobs(servers) + // Processing a playlist by the receiver could be long + await wait(3000) for (const server of servers) { const res = await getVideoPlaylistsList(server.url, 0, 5) @@ -310,6 +313,7 @@ describe('Test video playlists', function () { } await waitJobs(servers) + await wait(3000) for (const server of [ servers[0], servers[1] ]) { const res = await getVideoPlaylistsList(server.url, 0, 5) @@ -451,6 +455,7 @@ describe('Test video playlists', function () { }) await waitJobs(servers) + await wait(3000) for (const server of servers) { const results = [