Try to speed up server tests

5 files changed, 61 insertions, 23 deletions

diff --git a/shared/extra-utils/index.ts b/shared/extra-utils/index.ts
index 8f5c709ff..5c95a1b3e 100644
--- a/shared/extra-utils/index.ts
+++ b/shared/extra-utils/index.ts
@@ -1,32 +1,33 @@
-export * from './server/activitypub'
 export * from './bulk/bulk'
 export * from './cli/cli'
-export * from './server/clients'
-export * from './server/config'
-export * from './server/jobs'
-export * from './users/login'
+export * from './feeds/feeds'
+export * from './instances-index/mock-instances-index'
 export * from './miscs/miscs'
-export * from './miscs/stubs'
 export * from './miscs/sql'
-export * from './server/follows'
-export * from './requests/requests'
+export * from './miscs/stubs'
+export * from './moderation/abuses'
+export * from './plugins/mock-blocklist'
 export * from './requests/check-api-params'
-export * from './server/servers'
+export * from './requests/requests'
+export * from './search/videos'
+export * from './server/activitypub'
+export * from './server/clients'
+export * from './server/config'
+export * from './server/debug'
+export * from './server/follows'
+export * from './server/jobs'
 export * from './server/plugins'
-export * from './videos/video-playlists'
-export * from './users/users'
+export * from './server/servers'
 export * from './users/accounts'
-export * from './moderation/abuses'
-export * from './videos/services'
+export * from './users/login'
+export * from './users/users'
 export * from './videos/live'
+export * from './videos/services'
 export * from './videos/video-blacklist'
 export * from './videos/video-captions'
+export * from './videos/video-change-ownership'
 export * from './videos/video-channels'
 export * from './videos/video-comments'
+export * from './videos/video-playlists'
 export * from './videos/video-streaming-playlists'
 export * from './videos/videos'
-export * from './videos/video-change-ownership'
-export * from './feeds/feeds'
-export * from './instances-index/mock-instances-index'
-export * from './search/videos'
-export * from './plugins/mock-blocklist'
diff --git a/shared/extra-utils/server/debug.ts b/shared/extra-utils/server/debug.ts
new file mode 100644
index 000000000..5cf80a5fb
--- /dev/null
+++ b/shared/extra-utils/server/debug.ts
@@ -0,0 +1,19 @@
+import { makeGetRequest } from '../requests/requests'
+import { HttpStatusCode } from '../../core-utils/miscs/http-error-codes'
+
+function getDebug (url: string, token: string) {
+  const path = '/api/v1/server/debug'
+
+  return makeGetRequest({
+    url,
+    path,
+    token,
+    statusCodeExpected: HttpStatusCode.OK_200
+  })
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  getDebug
+}
diff --git a/shared/extra-utils/server/jobs.ts b/shared/extra-utils/server/jobs.ts
index a53749589..97971f960 100644
--- a/shared/extra-utils/server/jobs.ts
+++ b/shared/extra-utils/server/jobs.ts
@@ -1,7 +1,7 @@
 import * as request from 'supertest'
 import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
-import { makeGetRequest } from '../../../shared/extra-utils'
-import { Job, JobState, JobType } from '../../models'
+import { getDebug, makeGetRequest } from '../../../shared/extra-utils'
+import { Job, JobState, JobType, ServerDebug } from '../../models'
 import { wait } from '../miscs/miscs'
 import { ServerInfo } from './servers'
 
@@ -53,7 +53,10 @@ function getJobsListPaginationAndSort (options: {
 }
 
 async function waitJobs (serversArg: ServerInfo[] | ServerInfo) {
-  const pendingJobWait = process.env.NODE_PENDING_JOB_WAIT ? parseInt(process.env.NODE_PENDING_JOB_WAIT, 10) : 2000
+  const pendingJobWait = process.env.NODE_PENDING_JOB_WAIT
+    ? parseInt(process.env.NODE_PENDING_JOB_WAIT, 10)
+    : 500
+
   let servers: ServerInfo[]
 
   if (Array.isArray(serversArg) === false) servers = [ serversArg as ServerInfo ]
@@ -75,16 +78,26 @@ async function waitJobs (serversArg: ServerInfo[] | ServerInfo) {
           start: 0,
           count: 10,
           sort: '-createdAt'
-        })
-          .then(res => res.body.data)
+        }).then(res => res.body.data)
           .then((jobs: Job[]) => jobs.filter(j => j.type !== 'videos-views'))
           .then(jobs => {
             if (jobs.length !== 0) {
               pendingRequests = true
             }
           })
+
         tasks.push(p)
       }
+
+      const p = getDebug(server.url, server.accessToken)
+        .then(res => res.body)
+        .then((obj: ServerDebug) => {
+          if (obj.activityPubMessagesWaiting !== 0) {
+            pendingRequests = true
+          }
+        })
+
+      tasks.push(p)
     }
 
     return tasks
diff --git a/shared/models/server/index.ts b/shared/models/server/index.ts
index f253a3a79..b5163954a 100644
--- a/shared/models/server/index.ts
+++ b/shared/models/server/index.ts
@@ -7,5 +7,6 @@ export * from './emailer.model'
 export * from './job.model'
 export * from './log-level.type'
 export * from './server-config.model'
+export * from './server-debug.model'
 export * from './server-error-code.enum'
 export * from './server-stats.model'
diff --git a/shared/models/server/server-debug.model.ts b/shared/models/server/server-debug.model.ts
new file mode 100644
index 000000000..4b731bb90
--- /dev/null
+++ b/shared/models/server/server-debug.model.ts
@@ -0,0 +1,4 @@
+export interface ServerDebug {
+  ip: string
+  activityPubMessagesWaiting: number
+}