X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fjobs.ts;h=6cc88a12362b3d52b08f917169395300b076ecc3;hb=52fe4b671a20c37ae46cf88d175dd16cddfc4de7;hp=c10c154c2a52586d9f7623f4ead38d7613250a32;hpb=171efc48e67498406feb6d7873b3482b41505515;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts index c10c154c2..6cc88a123 100644 --- a/server/tests/api/server/jobs.ts +++ b/server/tests/api/server/jobs.ts @@ -2,15 +2,17 @@ import 'mocha' import * as chai from 'chai' +import { dateIsValid } from '@server/tests/shared' import { cleanupTests, createMultipleServers, - dateIsValid, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' +import { wait } from '@shared/core-utils' +import { uuid } from 'short-uuid' const expect = chai.expect @@ -38,14 +40,14 @@ describe('Test jobs', function () { }) it('Should list jobs', async function () { - const body = await servers[1].jobs.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].jobs.getJobsList({ + const body = await servers[1].jobs.list({ state: 'completed', start: 1, count: 2, @@ -56,7 +58,7 @@ 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 @@ -66,7 +68,7 @@ describe('Test jobs', function () { } { - const body = await servers[1].jobs.getJobsList({ + const body = await servers[1].jobs.list({ state: 'completed', start: 0, count: 100, @@ -82,17 +84,41 @@ describe('Test jobs', function () { }) it('Should list all jobs', async function () { - const body = await servers[1].jobs.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' }) + expect(body.data).to.have.lengthOf(4) + }) + + 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) })