X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fjobs.ts;h=d0e6df7197cec7764ba5b6a4f1d33c65e4621e3b;hb=0a8a79552cf59c800011c9f63eaa8658230acddc;hp=c0b9facffff3b08ed9226752537e1c933fac1083;hpb=9c6327f803aaf4200672f1fc40b2f43786daca47;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts
index c0b9facff..d0e6df719 100644
--- a/server/tests/api/server/jobs.ts
+++ b/server/tests/api/server/jobs.ts
@@ -1,27 +1,24 @@
 /* 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,
-  dateIsValid,
+  createMultipleServers,
   doubleFollow,
-  flushAndRunMultipleServers,
-  ServerInfo,
+  PeerTubeServer,
   setAccessTokensToServers,
-  uploadVideo,
   waitJobs
-} from '@shared/extra-utils'
-
-const expect = chai.expect
+} from '@shared/server-commands'
 
 describe('Test jobs', function () {
-  let servers: ServerInfo[]
+  let servers: PeerTubeServer[]
 
   before(async function () {
-    this.timeout(30000)
+    this.timeout(240000)
 
-    servers = await flushAndRunMultipleServers(2)
+    servers = await createMultipleServers(2)
 
     await setAccessTokensToServers(servers)
 
@@ -30,23 +27,23 @@ describe('Test jobs', function () {
   })
 
   it('Should create some jobs', async function () {
-    this.timeout(60000)
+    this.timeout(240000)
 
-    await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video1' })
-    await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video2' })
+    await servers[1].videos.upload({ attributes: { name: 'video1' } })
+    await servers[1].videos.upload({ attributes: { name: 'video2' } })
 
     await waitJobs(servers)
   })
 
   it('Should list jobs', async function () {
-    const body = await servers[1].jobsCommand.getJobsList({ state: 'completed' })
+    const body = await servers[1].jobs.list({ state: 'completed' })
     expect(body.total).to.be.above(2)
     expect(body.data).to.have.length.above(2)
   })
 
   it('Should list jobs with sort, pagination and job type', async function () {
     {
-      const body = await servers[1].jobsCommand.getJobsList({
+      const body = await servers[1].jobs.list({
         state: 'completed',
         start: 1,
         count: 2,
@@ -57,17 +54,16 @@ describe('Test jobs', function () {
 
       let job = body.data[0]
       // Skip repeat jobs
-      if (job.type === 'videos-views') job = body.data[1]
+      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
     }
 
     {
-      const body = await servers[1].jobsCommand.getJobsList({
+      const body = await servers[1].jobs.list({
         state: 'completed',
         start: 0,
         count: 100,
@@ -83,17 +79,49 @@ describe('Test jobs', function () {
   })
 
   it('Should list all jobs', async function () {
-    const body = await servers[1].jobsCommand.getJobsList()
+    const body = await servers[1].jobs.list()
     expect(body.total).to.be.above(2)
 
     const jobs = body.data
     expect(jobs).to.have.length.above(2)
 
-    // We know there are a least 1 delayed job (video views) and 1 completed job (broadcast)
-    expect(jobs.find(j => j.state === 'delayed')).to.not.be.undefined
     expect(jobs.find(j => j.state === 'completed')).to.not.be.undefined
   })
 
+  it('Should pause the job queue', async function () {
+    this.timeout(120000)
+
+    const { uuid } = await servers[1].videos.upload({ attributes: { name: 'video2' } })
+    await waitJobs(servers)
+
+    await servers[1].jobs.pauseJobQueue()
+    await servers[1].videos.runTranscoding({ videoId: uuid, transcodingType: 'hls' })
+
+    await wait(5000)
+
+    {
+      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 () {
+    this.timeout(120000)
+
+    await servers[1].jobs.resumeJobQueue()
+
+    await waitJobs(servers)
+
+    const body = await servers[1].jobs.list({ state: 'waiting', jobType: 'video-transcoding' })
+    expect(body.data).to.have.lengthOf(0)
+  })
+
   after(async function () {
     await cleanupTests(servers)
   })