Create another test suite for transcoding jobs

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8ba2c549d37641f358dc54f2a1eb4ee03224b626..f0b9778b0385a5944a7f19913cf22a635a20f54a 100644 (file)
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test_suite: [ types-package, client, api-1, api-2, api-3, api-4, cli-plugin, lint, external-plugins ]
+        test_suite: [ types-package, client, api-1, api-2, api-3, api-4, api-5, cli-plugin, lint, external-plugins ]
 
     env:
       PGUSER: peertube

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 2bacf2a2e18d23c34de46f7081bce669ec2b9336..5f1230d33c0f6752813ca4a82af50d10d54cf966 100755 (executable)
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -94,6 +94,12 @@ elif [ "$1" = "api-4" ]; then
     activitypubFiles=$(findTestFiles ./dist/server/tests/api/activitypub)
 
     MOCHA_PARALLEL=true runTest "$1" 2 $moderationFiles $redundancyFiles $activitypubFiles $objectStorageFiles
+elif [ "$1" = "api-5" ]; then
+    npm run build:server
+
+    transcodingFiles=$(findTestFiles ./dist/server/tests/api/transcoding)
+
+    MOCHA_PARALLEL=true runTest "$1" 2 $transcodingFiles
 elif [ "$1" = "external-plugins" ]; then
     npm run build:server
 

diff --git a/scripts/test.sh b/scripts/test.sh
index 4d1d8720a68f5866ba9896ee9f973381dba2e57b..3b294b386b56d9d04bf150d569410cd373e72d39 100755 (executable)
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -9,6 +9,7 @@ npm run ci -- api-1
 npm run ci -- api-2
 npm run ci -- api-3
 npm run ci -- api-4
+npm run ci -- api-5
 npm run ci -- external-plugins
 
 npm run ci -- lint

diff --git a/server/tests/api/index.ts b/server/tests/api/index.ts
index 19301c0b936a3c863ee34804f81707fd44ac555d..61352a134d2dc28ca291ac414587746b99b3aa8f 100644 (file)
--- a/server/tests/api/index.ts
+++ b/server/tests/api/index.ts
@@ -7,5 +7,6 @@ import './notifications'
 import './redundancy'
 import './search'
 import './server'
+import './transcoding'
 import './users'
 import './videos'

diff --git a/server/tests/api/videos/audio-only.ts b/server/tests/api/transcoding/audio-only.ts
similarity index 100%
rename from server/tests/api/videos/audio-only.ts
rename to server/tests/api/transcoding/audio-only.ts

diff --git a/server/tests/api/videos/video-create-transcoding.ts b/server/tests/api/transcoding/create-transcoding.ts
similarity index 100%
rename from server/tests/api/videos/video-create-transcoding.ts
rename to server/tests/api/transcoding/create-transcoding.ts

diff --git a/server/tests/api/videos/video-hls.ts b/server/tests/api/transcoding/hls.ts
similarity index 100%
rename from server/tests/api/videos/video-hls.ts
rename to server/tests/api/transcoding/hls.ts

diff --git a/server/tests/api/transcoding/index.ts b/server/tests/api/transcoding/index.ts
new file mode 100644 (file)
index 0000000..8a0a1d7
--- /dev/null
+++ b/server/tests/api/transcoding/index.ts
@@ -0,0 +1,5 @@
+export * from './audio-only'
+export * from './create-transcoding'
+export * from './hls'
+export * from './transcoder'
+export * from './video-editor'

diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/transcoding/transcoder.ts
similarity index 100%
rename from server/tests/api/videos/video-transcoder.ts
rename to server/tests/api/transcoding/transcoder.ts

diff --git a/server/tests/api/videos/video-editor.ts b/server/tests/api/transcoding/video-editor.ts
similarity index 100%
rename from server/tests/api/videos/video-editor.ts
rename to server/tests/api/transcoding/video-editor.ts

diff --git a/server/tests/api/videos/index.ts b/server/tests/api/videos/index.ts
index 72e6ae2b4b3d42880975d5d03c76b6fbac755199..7dc826353596dc8a117c2a10214ae613ba527861 100644 (file)
--- a/server/tests/api/videos/index.ts
+++ b/server/tests/api/videos/index.ts
@@ -1,4 +1,3 @@
-import './audio-only'
 import './multiple-servers'
 import './resumable-upload'
 import './single-server'
@@ -6,18 +5,14 @@ import './video-captions'
 import './video-change-ownership'
 import './video-channels'
 import './video-comments'
-import './video-create-transcoding'
 import './video-description'
-import './video-editor'
 import './video-files'
-import './video-hls'
 import './video-imports'
 import './video-nsfw'
 import './video-playlists'
 import './video-playlist-thumbnails'
 import './video-privacy'
 import './video-schedule-update'
-import './video-transcoder'
 import './videos-common-filters'
 import './videos-history'
 import './videos-overview'