Ensure we don't run transcoding after import file

diff --git a/server/tests/api/videos/video-create-transcoding.ts b/server/tests/api/videos/video-create-transcoding.ts
index 128bc885a2fc97b26063dfffe63a225ab112e598..c4627e0c120255bf07e8c79457796a5159bdb65f 100644 (file)
--- a/server/tests/api/videos/video-create-transcoding.ts
+++ b/server/tests/api/videos/video-create-transcoding.ts
@@ -7,6 +7,7 @@ import {
   cleanupTests,
   createMultipleServers,
   doubleFollow,
+  expectNoFailedTranscodingJob,
   expectStartWith,
   makeRawRequest,
   ObjectStorageCommand,
@@ -30,11 +31,6 @@ async function checkFilesInObjectStorage (video: VideoDetails) {
   }
 }
 
-async function expectNoFailedTranscodingJob (server: PeerTubeServer) {
-  const { data } = await server.jobs.listFailed({ jobType: 'video-transcoding' })
-  expect(data).to.have.lengthOf(0)
-}
-
 function runTests (objectStorage: boolean) {
   let servers: PeerTubeServer[] = []
   let videoUUID: string

diff --git a/server/tests/cli/create-import-video-file-job.ts b/server/tests/cli/create-import-video-file-job.ts
index 1e278bacccb00136287abfdc9086da5574867c3a..17ed67b0593f476a53dbb6194dfcc9ce15e8945e 100644 (file)
--- a/server/tests/cli/create-import-video-file-job.ts
+++ b/server/tests/cli/create-import-video-file-job.ts
@@ -7,6 +7,7 @@ import {
   cleanupTests,
   createMultipleServers,
   doubleFollow,
+  expectNoFailedTranscodingJob,
   expectStartWith,
   makeRawRequest,
   ObjectStorageCommand,
@@ -69,6 +70,10 @@ function runTests (objectStorage: boolean) {
     }
 
     await waitJobs(servers)
+
+    for (const server of servers) {
+      await server.config.enableTranscoding()
+    }
   })
 
   it('Should run a import job on video 1 with a lower resolution', async function () {
@@ -139,6 +144,11 @@ function runTests (objectStorage: boolean) {
     }
   })
 
+  it('Should not have run transcoding after an import job', async function () {
+    const { data } = await servers[0].jobs.list({ jobType: 'video-transcoding' })
+    expect(data).to.have.lengthOf(0)
+  })
+
   after(async function () {
     await cleanupTests(servers)
   })

diff --git a/shared/extra-utils/server/jobs.ts b/shared/extra-utils/server/jobs.ts
index afaaa5cd6097fc3a64525859ac2b1941760d94ed..34fefd4442d28fa9d158ae3021deb2dde99b6014 100644 (file)
--- a/shared/extra-utils/server/jobs.ts
+++ b/shared/extra-utils/server/jobs.ts
@@ -1,4 +1,5 @@
 
+import { expect } from 'chai'
 import { JobState, JobType } from '../../models'
 import { wait } from '../miscs'
 import { PeerTubeServer } from './server'
@@ -70,8 +71,14 @@ async function waitJobs (serversArg: PeerTubeServer[] | PeerTubeServer, skipDela
   } while (pendingRequests)
 }
 
+async function expectNoFailedTranscodingJob (server: PeerTubeServer) {
+  const { data } = await server.jobs.listFailed({ jobType: 'video-transcoding' })
+  expect(data).to.have.lengthOf(0)
+}
+
 // ---------------------------------------------------------------------------
 
 export {
-  waitJobs
+  waitJobs,
+  expectNoFailedTranscodingJob
 }