aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/models/video/video.ts1
-rw-r--r--server/tests/api/videos/video-playlists.ts5
2 files changed, 5 insertions, 1 deletions
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'
129import { VideoStreamingPlaylistModel } from './video-streaming-playlist' 129import { VideoStreamingPlaylistModel } from './video-streaming-playlist'
130import { VideoTagModel } from './video-tag' 130import { VideoTagModel } from './video-tag'
131import { VideoViewModel } from './video-view' 131import { VideoViewModel } from './video-view'
132import { ne } from 'sequelize/types/lib/operators'
133 132
134export enum ScopeNames { 133export enum ScopeNames {
135 AVAILABLE_FOR_LIST_IDS = 'AVAILABLE_FOR_LIST_IDS', 134 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 {
41 uploadVideo, 41 uploadVideo,
42 uploadVideoAndGetId, 42 uploadVideoAndGetId,
43 userLogin, 43 userLogin,
44 wait,
44 waitJobs 45 waitJobs
45} from '../../../../shared/extra-utils' 46} from '../../../../shared/extra-utils'
46import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model' 47import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model'
@@ -227,6 +228,8 @@ describe('Test video playlists', function () {
227 }) 228 })
228 229
229 await waitJobs(servers) 230 await waitJobs(servers)
231 // Processing a playlist by the receiver could be long
232 await wait(3000)
230 233
231 for (const server of servers) { 234 for (const server of servers) {
232 const res = await getVideoPlaylistsList(server.url, 0, 5) 235 const res = await getVideoPlaylistsList(server.url, 0, 5)
@@ -310,6 +313,7 @@ describe('Test video playlists', function () {
310 } 313 }
311 314
312 await waitJobs(servers) 315 await waitJobs(servers)
316 await wait(3000)
313 317
314 for (const server of [ servers[0], servers[1] ]) { 318 for (const server of [ servers[0], servers[1] ]) {
315 const res = await getVideoPlaylistsList(server.url, 0, 5) 319 const res = await getVideoPlaylistsList(server.url, 0, 5)
@@ -451,6 +455,7 @@ describe('Test video playlists', function () {
451 }) 455 })
452 456
453 await waitJobs(servers) 457 await waitJobs(servers)
458 await wait(3000)
454 459
455 for (const server of servers) { 460 for (const server of servers) {
456 const results = [ 461 const results = [