aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests/api
diff options
context:
space:
mode:
Diffstat (limited to 'server/tests/api')
-rw-r--r--server/tests/api/check-params/config.ts2
-rw-r--r--server/tests/api/server/config.ts6
2 files changed, 8 insertions, 0 deletions
diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts
index d6c20f7af..c7eb3189b 100644
--- a/server/tests/api/check-params/config.ts
+++ b/server/tests/api/check-params/config.ts
@@ -86,6 +86,7 @@ describe('Test config API validators', function () {
86 enabled: true, 86 enabled: true,
87 allowAdditionalExtensions: true, 87 allowAdditionalExtensions: true,
88 allowAudioFiles: true, 88 allowAudioFiles: true,
89 concurrency: 1,
89 threads: 1, 90 threads: 1,
90 profile: 'vod_profile', 91 profile: 'vod_profile',
91 resolutions: { 92 resolutions: {
@@ -130,6 +131,7 @@ describe('Test config API validators', function () {
130 }, 131 },
131 import: { 132 import: {
132 videos: { 133 videos: {
134 concurrency: 1,
133 http: { 135 http: {
134 enabled: false 136 enabled: false
135 }, 137 },
diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts
index 26df8373e..b2371614f 100644
--- a/server/tests/api/server/config.ts
+++ b/server/tests/api/server/config.ts
@@ -70,6 +70,7 @@ function checkInitialConfig (server: ServerInfo, data: CustomConfig) {
70 expect(data.transcoding.allowAdditionalExtensions).to.be.false 70 expect(data.transcoding.allowAdditionalExtensions).to.be.false
71 expect(data.transcoding.allowAudioFiles).to.be.false 71 expect(data.transcoding.allowAudioFiles).to.be.false
72 expect(data.transcoding.threads).to.equal(2) 72 expect(data.transcoding.threads).to.equal(2)
73 expect(data.transcoding.concurrency).to.equal(2)
73 expect(data.transcoding.profile).to.equal('default') 74 expect(data.transcoding.profile).to.equal('default')
74 expect(data.transcoding.resolutions['240p']).to.be.true 75 expect(data.transcoding.resolutions['240p']).to.be.true
75 expect(data.transcoding.resolutions['360p']).to.be.true 76 expect(data.transcoding.resolutions['360p']).to.be.true
@@ -97,6 +98,7 @@ function checkInitialConfig (server: ServerInfo, data: CustomConfig) {
97 expect(data.live.transcoding.resolutions['1440p']).to.be.false 98 expect(data.live.transcoding.resolutions['1440p']).to.be.false
98 expect(data.live.transcoding.resolutions['2160p']).to.be.false 99 expect(data.live.transcoding.resolutions['2160p']).to.be.false
99 100
101 expect(data.import.videos.concurrency).to.equal(2)
100 expect(data.import.videos.http.enabled).to.be.true 102 expect(data.import.videos.http.enabled).to.be.true
101 expect(data.import.videos.torrent.enabled).to.be.true 103 expect(data.import.videos.torrent.enabled).to.be.true
102 expect(data.autoBlacklist.videos.ofUsers.enabled).to.be.false 104 expect(data.autoBlacklist.videos.ofUsers.enabled).to.be.false
@@ -159,6 +161,7 @@ function checkUpdatedConfig (data: CustomConfig) {
159 161
160 expect(data.transcoding.enabled).to.be.true 162 expect(data.transcoding.enabled).to.be.true
161 expect(data.transcoding.threads).to.equal(1) 163 expect(data.transcoding.threads).to.equal(1)
164 expect(data.transcoding.concurrency).to.equal(3)
162 expect(data.transcoding.allowAdditionalExtensions).to.be.true 165 expect(data.transcoding.allowAdditionalExtensions).to.be.true
163 expect(data.transcoding.allowAudioFiles).to.be.true 166 expect(data.transcoding.allowAudioFiles).to.be.true
164 expect(data.transcoding.profile).to.equal('vod_profile') 167 expect(data.transcoding.profile).to.equal('vod_profile')
@@ -186,6 +189,7 @@ function checkUpdatedConfig (data: CustomConfig) {
186 expect(data.live.transcoding.resolutions['1080p']).to.be.true 189 expect(data.live.transcoding.resolutions['1080p']).to.be.true
187 expect(data.live.transcoding.resolutions['2160p']).to.be.true 190 expect(data.live.transcoding.resolutions['2160p']).to.be.true
188 191
192 expect(data.import.videos.concurrency).to.equal(4)
189 expect(data.import.videos.http.enabled).to.be.false 193 expect(data.import.videos.http.enabled).to.be.false
190 expect(data.import.videos.torrent.enabled).to.be.false 194 expect(data.import.videos.torrent.enabled).to.be.false
191 expect(data.autoBlacklist.videos.ofUsers.enabled).to.be.true 195 expect(data.autoBlacklist.videos.ofUsers.enabled).to.be.true
@@ -323,6 +327,7 @@ describe('Test config', function () {
323 allowAdditionalExtensions: true, 327 allowAdditionalExtensions: true,
324 allowAudioFiles: true, 328 allowAudioFiles: true,
325 threads: 1, 329 threads: 1,
330 concurrency: 3,
326 profile: 'vod_profile', 331 profile: 'vod_profile',
327 resolutions: { 332 resolutions: {
328 '0p': false, 333 '0p': false,
@@ -364,6 +369,7 @@ describe('Test config', function () {
364 }, 369 },
365 import: { 370 import: {
366 videos: { 371 videos: {
372 concurrency: 4,
367 http: { 373 http: {
368 enabled: false 374 enabled: false
369 }, 375 },