X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fhandle-down.ts;h=84d310ae628e21b4ad7ab92c7acf4ea5c59178cf;hb=40e87e9ecc54e3513fb586928330a7855eb192c6;hp=4cedeb89efd61e758e31a4626a4bafcb6b74c52c;hpb=94a5ff8a4a75d75bb9df542a39ce8769e7a7e6a4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts
index 4cedeb89e..84d310ae6 100644
--- a/server/tests/api/server/handle-down.ts
+++ b/server/tests/api/server/handle-down.ts
@@ -6,15 +6,21 @@ import { JobState } from '../../../../shared/models'
 import { VideoPrivacy } from '../../../../shared/models/videos'
 import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
 import { completeVideoCheck, getVideo, immutableAssign, reRunServer, viewVideo } from '../../utils'
-
 import {
-  flushAndRunMultipleServers, flushTests, getVideosList, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo,
+  flushAndRunMultipleServers,
+  getVideosList,
+  killallServers,
+  ServerInfo,
+  setAccessTokensToServers,
+  uploadVideo,
   wait
 } from '../../utils/index'
 import { follow, getFollowersListPaginationAndSort } from '../../utils/server/follows'
-import { getJobsListPaginationAndSort } from '../../utils/server/jobs'
+import { getJobsListPaginationAndSort, waitJobs } from '../../utils/server/jobs'
 import {
-  addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads,
+  addVideoCommentReply,
+  addVideoCommentThread,
+  getVideoCommentThreads,
   getVideoThreadComments
 } from '../../utils/videos/video-comments'
 
@@ -32,10 +38,11 @@ describe('Test handle downs', function () {
     name: 'my super name for server 1',
     category: 5,
     licence: 4,
-    language: 9,
+    language: 'ja',
     nsfw: true,
     privacy: VideoPrivacy.PUBLIC,
     description: 'my super description for server 1',
+    support: 'my super support text for server 1',
     tags: [ 'tag1p1', 'tag2p1' ],
     fixture: 'video_short1.webm'
   }
@@ -48,11 +55,14 @@ describe('Test handle downs', function () {
     name: 'my super name for server 1',
     category: 5,
     licence: 4,
-    language: 9,
+    language: 'ja',
     nsfw: true,
     description: 'my super description for server 1',
-    host: 'localhost:9001',
-    account: 'root',
+    support: 'my super support text for server 1',
+    account: {
+      name: 'root',
+      host: 'localhost:9001'
+    },
     isLocal: false,
     duration: 10,
     tags: [ 'tag1p1', 'tag2p1' ],
@@ -90,11 +100,11 @@ describe('Test handle downs', function () {
 
     await follow(servers[1].url, [ servers[0].url ], servers[1].accessToken)
 
-    await wait(5000)
+    await waitJobs(servers)
 
     await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes)
 
-    await wait(5000)
+    await waitJobs(servers)
 
     for (const server of servers) {
       const res = await getVideosList(server.url)
@@ -114,7 +124,7 @@ describe('Test handle downs', function () {
       videos.push(resVideo.body.video)
     }
 
-    await wait(2000)
+    await waitJobs(servers[0])
 
     await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, videoAttributes)
 
@@ -132,7 +142,9 @@ describe('Test handle downs', function () {
       commentIdServer1 = resComment.body.comment.id
     }
 
-    await wait(10000)
+    await waitJobs(servers[0])
+    // Wait scheduler
+    await wait(11000)
 
     const res = await getFollowersListPaginationAndSort(servers[0].url, 0, 1, 'createdAt')
     expect(res.body.data).to.be.an('array')
@@ -140,7 +152,7 @@ describe('Test handle downs', function () {
   })
 
   it('Should not have pending/processing jobs anymore', async function () {
-    const states: JobState[] = [ 'inactive', 'active' ]
+    const states: JobState[] = [ 'waiting', 'active' ]
 
     for (const state of states) {
       const res = await getJobsListPaginationAndSort(servers[ 0 ].url, servers[ 0 ].accessToken, state,0, 50, '-createdAt')
@@ -155,7 +167,7 @@ describe('Test handle downs', function () {
 
     await follow(servers[1].url, [ servers[0].url ], servers[1].accessToken)
 
-    await wait(5000)
+    await waitJobs(servers)
 
     const res = await getFollowersListPaginationAndSort(servers[0].url, 0, 1, 'createdAt')
     expect(res.body.data).to.be.an('array')
@@ -167,7 +179,7 @@ describe('Test handle downs', function () {
 
     await viewVideo(servers[0].url, videos[0].uuid)
 
-    await wait(5000)
+    await waitJobs(servers)
 
     const res = await getVideosList(servers[1].url)
     expect(res.body.data).to.be.an('array')
@@ -185,7 +197,7 @@ describe('Test handle downs', function () {
 
     await addVideoCommentReply(servers[0].url, servers[0].accessToken, videos[1].uuid, commentIdServer1, 'comment 1-3')
 
-    await wait(5000)
+    await waitJobs(servers)
 
     const resVideo = await getVideo(servers[1].url, videos[0].uuid)
     expect(resVideo.body).not.to.be.undefined
@@ -226,7 +238,7 @@ describe('Test handle downs', function () {
 
     await addVideoCommentReply(servers[1].url, servers[1].accessToken, videos[1].uuid, commentIdServer2, 'comment 1-4')
 
-    await wait(5000)
+    await waitJobs(servers)
 
     {
       const resComment = await getVideoThreadComments(servers[0].url, videos[1].uuid, threadIdServer1)
@@ -255,10 +267,5 @@ describe('Test handle downs', function () {
 
   after(async function () {
     killallServers(servers)
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
   })
 })