aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/test.yml2
-rwxr-xr-xscripts/ci.sh6
-rwxr-xr-xscripts/test.sh1
-rw-r--r--server/tests/api/index.ts1
-rw-r--r--server/tests/api/transcoding/audio-only.ts (renamed from server/tests/api/videos/audio-only.ts)0
-rw-r--r--server/tests/api/transcoding/create-transcoding.ts (renamed from server/tests/api/videos/video-create-transcoding.ts)0
-rw-r--r--server/tests/api/transcoding/hls.ts (renamed from server/tests/api/videos/video-hls.ts)0
-rw-r--r--server/tests/api/transcoding/index.ts5
-rw-r--r--server/tests/api/transcoding/transcoder.ts (renamed from server/tests/api/videos/video-transcoder.ts)0
-rw-r--r--server/tests/api/transcoding/video-editor.ts (renamed from server/tests/api/videos/video-editor.ts)0
-rw-r--r--server/tests/api/videos/index.ts5
11 files changed, 14 insertions, 6 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8ba2c549d..f0b9778b0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,7 +39,7 @@ jobs:
39 strategy: 39 strategy:
40 fail-fast: false 40 fail-fast: false
41 matrix: 41 matrix:
42 test_suite: [ types-package, client, api-1, api-2, api-3, api-4, cli-plugin, lint, external-plugins ] 42 test_suite: [ types-package, client, api-1, api-2, api-3, api-4, api-5, cli-plugin, lint, external-plugins ]
43 43
44 env: 44 env:
45 PGUSER: peertube 45 PGUSER: peertube
diff --git a/scripts/ci.sh b/scripts/ci.sh
index 2bacf2a2e..5f1230d33 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -94,6 +94,12 @@ elif [ "$1" = "api-4" ]; then
94 activitypubFiles=$(findTestFiles ./dist/server/tests/api/activitypub) 94 activitypubFiles=$(findTestFiles ./dist/server/tests/api/activitypub)
95 95
96 MOCHA_PARALLEL=true runTest "$1" 2 $moderationFiles $redundancyFiles $activitypubFiles $objectStorageFiles 96 MOCHA_PARALLEL=true runTest "$1" 2 $moderationFiles $redundancyFiles $activitypubFiles $objectStorageFiles
97elif [ "$1" = "api-5" ]; then
98 npm run build:server
99
100 transcodingFiles=$(findTestFiles ./dist/server/tests/api/transcoding)
101
102 MOCHA_PARALLEL=true runTest "$1" 2 $transcodingFiles
97elif [ "$1" = "external-plugins" ]; then 103elif [ "$1" = "external-plugins" ]; then
98 npm run build:server 104 npm run build:server
99 105
diff --git a/scripts/test.sh b/scripts/test.sh
index 4d1d8720a..3b294b386 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -9,6 +9,7 @@ npm run ci -- api-1
9npm run ci -- api-2 9npm run ci -- api-2
10npm run ci -- api-3 10npm run ci -- api-3
11npm run ci -- api-4 11npm run ci -- api-4
12npm run ci -- api-5
12npm run ci -- external-plugins 13npm run ci -- external-plugins
13 14
14npm run ci -- lint 15npm run ci -- lint
diff --git a/server/tests/api/index.ts b/server/tests/api/index.ts
index 19301c0b9..61352a134 100644
--- a/server/tests/api/index.ts
+++ b/server/tests/api/index.ts
@@ -7,5 +7,6 @@ import './notifications'
7import './redundancy' 7import './redundancy'
8import './search' 8import './search'
9import './server' 9import './server'
10import './transcoding'
10import './users' 11import './users'
11import './videos' 12import './videos'
diff --git a/server/tests/api/videos/audio-only.ts b/server/tests/api/transcoding/audio-only.ts
index e7e73d382..e7e73d382 100644
--- a/server/tests/api/videos/audio-only.ts
+++ b/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
index a4defdf51..a4defdf51 100644
--- a/server/tests/api/videos/video-create-transcoding.ts
+++ b/server/tests/api/transcoding/create-transcoding.ts
diff --git a/server/tests/api/videos/video-hls.ts b/server/tests/api/transcoding/hls.ts
index 218ec08ae..218ec08ae 100644
--- a/server/tests/api/videos/video-hls.ts
+++ b/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
index 000000000..8a0a1d787
--- /dev/null
+++ b/server/tests/api/transcoding/index.ts
@@ -0,0 +1,5 @@
1export * from './audio-only'
2export * from './create-transcoding'
3export * from './hls'
4export * from './transcoder'
5export * from './video-editor'
diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/transcoding/transcoder.ts
index 245c4c012..245c4c012 100644
--- a/server/tests/api/videos/video-transcoder.ts
+++ b/server/tests/api/transcoding/transcoder.ts
diff --git a/server/tests/api/videos/video-editor.ts b/server/tests/api/transcoding/video-editor.ts
index a9b6950cc..a9b6950cc 100644
--- a/server/tests/api/videos/video-editor.ts
+++ b/server/tests/api/transcoding/video-editor.ts
diff --git a/server/tests/api/videos/index.ts b/server/tests/api/videos/index.ts
index 72e6ae2b4..7dc826353 100644
--- a/server/tests/api/videos/index.ts
+++ b/server/tests/api/videos/index.ts
@@ -1,4 +1,3 @@
1import './audio-only'
2import './multiple-servers' 1import './multiple-servers'
3import './resumable-upload' 2import './resumable-upload'
4import './single-server' 3import './single-server'
@@ -6,18 +5,14 @@ import './video-captions'
6import './video-change-ownership' 5import './video-change-ownership'
7import './video-channels' 6import './video-channels'
8import './video-comments' 7import './video-comments'
9import './video-create-transcoding'
10import './video-description' 8import './video-description'
11import './video-editor'
12import './video-files' 9import './video-files'
13import './video-hls'
14import './video-imports' 10import './video-imports'
15import './video-nsfw' 11import './video-nsfw'
16import './video-playlists' 12import './video-playlists'
17import './video-playlist-thumbnails' 13import './video-playlist-thumbnails'
18import './video-privacy' 14import './video-privacy'
19import './video-schedule-update' 15import './video-schedule-update'
20import './video-transcoder'
21import './videos-common-filters' 16import './videos-common-filters'
22import './videos-history' 17import './videos-history'
23import './videos-overview' 18import './videos-overview'