Merge branch 'feature/SO035' into develop

[github/Chocobozzz/PeerTube.git] / server / tests / api / server / jobs.ts

diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts
index 6cc88a12362b3d52b08f917169395300b076ecc3..d0e6df7197cec7764ba5b6a4f1d33c65e4621e3b 100644 (file)
--- a/server/tests/api/server/jobs.ts
+++ b/server/tests/api/server/jobs.ts
@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import 'mocha'
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { dateIsValid } from '@server/tests/shared'
+import { wait } from '@shared/core-utils'
 import {
   cleanupTests,
   createMultipleServers,
@@ -11,16 +11,12 @@ import {
   setAccessTokensToServers,
   waitJobs
 } from '@shared/server-commands'
-import { wait } from '@shared/core-utils'
-import { uuid } from 'short-uuid'
-
-const expect = chai.expect
 
 describe('Test jobs', function () {
   let servers: PeerTubeServer[]
 
   before(async function () {
-    this.timeout(30000)
+    this.timeout(240000)
 
     servers = await createMultipleServers(2)
 
@@ -31,7 +27,7 @@ describe('Test jobs', function () {
   })
 
   it('Should create some jobs', async function () {
-    this.timeout(120000)
+    this.timeout(240000)
 
     await servers[1].videos.upload({ attributes: { name: 'video1' } })
     await servers[1].videos.upload({ attributes: { name: 'video2' } })
@@ -61,7 +57,6 @@ describe('Test jobs', function () {
       if (job.type === 'videos-views-stats') job = body.data[1]
 
       expect(job.state).to.equal('completed')
-      expect(job.type.startsWith('activitypub-')).to.be.true
       expect(dateIsValid(job.createdAt as string)).to.be.true
       expect(dateIsValid(job.processedOn as string)).to.be.true
       expect(dateIsValid(job.finishedOn as string)).to.be.true
@@ -104,8 +99,16 @@ describe('Test jobs', function () {
 
     await wait(5000)
 
-    const body = await servers[1].jobs.list({ state: 'waiting', jobType: 'video-transcoding' })
-    expect(body.data).to.have.lengthOf(4)
+    {
+      const body = await servers[1].jobs.list({ state: 'waiting', jobType: 'video-transcoding' })
+      // waiting includes waiting-children
+      expect(body.data).to.have.lengthOf(4)
+    }
+
+    {
+      const body = await servers[1].jobs.list({ state: 'waiting-children', jobType: 'video-transcoding' })
+      expect(body.data).to.have.lengthOf(1)
+    }
   })
 
   it('Should resume the job queue', async function () {