diff options
Diffstat (limited to 'server/tests')
-rw-r--r-- | server/tests/api/videos/video-create-transcoding.ts | 6 | ||||
-rw-r--r-- | server/tests/cli/create-import-video-file-job.ts | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/server/tests/api/videos/video-create-transcoding.ts b/server/tests/api/videos/video-create-transcoding.ts index 128bc885a..c4627e0c1 100644 --- a/server/tests/api/videos/video-create-transcoding.ts +++ b/server/tests/api/videos/video-create-transcoding.ts | |||
@@ -7,6 +7,7 @@ import { | |||
7 | cleanupTests, | 7 | cleanupTests, |
8 | createMultipleServers, | 8 | createMultipleServers, |
9 | doubleFollow, | 9 | doubleFollow, |
10 | expectNoFailedTranscodingJob, | ||
10 | expectStartWith, | 11 | expectStartWith, |
11 | makeRawRequest, | 12 | makeRawRequest, |
12 | ObjectStorageCommand, | 13 | ObjectStorageCommand, |
@@ -30,11 +31,6 @@ async function checkFilesInObjectStorage (video: VideoDetails) { | |||
30 | } | 31 | } |
31 | } | 32 | } |
32 | 33 | ||
33 | async function expectNoFailedTranscodingJob (server: PeerTubeServer) { | ||
34 | const { data } = await server.jobs.listFailed({ jobType: 'video-transcoding' }) | ||
35 | expect(data).to.have.lengthOf(0) | ||
36 | } | ||
37 | |||
38 | function runTests (objectStorage: boolean) { | 34 | function runTests (objectStorage: boolean) { |
39 | let servers: PeerTubeServer[] = [] | 35 | let servers: PeerTubeServer[] = [] |
40 | let videoUUID: string | 36 | 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 1e278bacc..17ed67b05 100644 --- 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 { | |||
7 | cleanupTests, | 7 | cleanupTests, |
8 | createMultipleServers, | 8 | createMultipleServers, |
9 | doubleFollow, | 9 | doubleFollow, |
10 | expectNoFailedTranscodingJob, | ||
10 | expectStartWith, | 11 | expectStartWith, |
11 | makeRawRequest, | 12 | makeRawRequest, |
12 | ObjectStorageCommand, | 13 | ObjectStorageCommand, |
@@ -69,6 +70,10 @@ function runTests (objectStorage: boolean) { | |||
69 | } | 70 | } |
70 | 71 | ||
71 | await waitJobs(servers) | 72 | await waitJobs(servers) |
73 | |||
74 | for (const server of servers) { | ||
75 | await server.config.enableTranscoding() | ||
76 | } | ||
72 | }) | 77 | }) |
73 | 78 | ||
74 | it('Should run a import job on video 1 with a lower resolution', async function () { | 79 | it('Should run a import job on video 1 with a lower resolution', async function () { |
@@ -139,6 +144,11 @@ function runTests (objectStorage: boolean) { | |||
139 | } | 144 | } |
140 | }) | 145 | }) |
141 | 146 | ||
147 | it('Should not have run transcoding after an import job', async function () { | ||
148 | const { data } = await servers[0].jobs.list({ jobType: 'video-transcoding' }) | ||
149 | expect(data).to.have.lengthOf(0) | ||
150 | }) | ||
151 | |||
142 | after(async function () { | 152 | after(async function () { |
143 | await cleanupTests(servers) | 153 | await cleanupTests(servers) |
144 | }) | 154 | }) |