diff options
-rw-r--r-- | .github/workflows/test.yml | 2 | ||||
-rwxr-xr-x | scripts/ci.sh | 6 | ||||
-rwxr-xr-x | scripts/test.sh | 1 | ||||
-rw-r--r-- | server/tests/api/index.ts | 1 | ||||
-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.ts | 5 | ||||
-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.ts | 5 |
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 |
97 | elif [ "$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 | ||
97 | elif [ "$1" = "external-plugins" ]; then | 103 | elif [ "$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 | |||
9 | npm run ci -- api-2 | 9 | npm run ci -- api-2 |
10 | npm run ci -- api-3 | 10 | npm run ci -- api-3 |
11 | npm run ci -- api-4 | 11 | npm run ci -- api-4 |
12 | npm run ci -- api-5 | ||
12 | npm run ci -- external-plugins | 13 | npm run ci -- external-plugins |
13 | 14 | ||
14 | npm run ci -- lint | 15 | npm 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' | |||
7 | import './redundancy' | 7 | import './redundancy' |
8 | import './search' | 8 | import './search' |
9 | import './server' | 9 | import './server' |
10 | import './transcoding' | ||
10 | import './users' | 11 | import './users' |
11 | import './videos' | 12 | import './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 @@ | |||
1 | export * from './audio-only' | ||
2 | export * from './create-transcoding' | ||
3 | export * from './hls' | ||
4 | export * from './transcoder' | ||
5 | export * 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 @@ | |||
1 | import './audio-only' | ||
2 | import './multiple-servers' | 1 | import './multiple-servers' |
3 | import './resumable-upload' | 2 | import './resumable-upload' |
4 | import './single-server' | 3 | import './single-server' |
@@ -6,18 +5,14 @@ import './video-captions' | |||
6 | import './video-change-ownership' | 5 | import './video-change-ownership' |
7 | import './video-channels' | 6 | import './video-channels' |
8 | import './video-comments' | 7 | import './video-comments' |
9 | import './video-create-transcoding' | ||
10 | import './video-description' | 8 | import './video-description' |
11 | import './video-editor' | ||
12 | import './video-files' | 9 | import './video-files' |
13 | import './video-hls' | ||
14 | import './video-imports' | 10 | import './video-imports' |
15 | import './video-nsfw' | 11 | import './video-nsfw' |
16 | import './video-playlists' | 12 | import './video-playlists' |
17 | import './video-playlist-thumbnails' | 13 | import './video-playlist-thumbnails' |
18 | import './video-privacy' | 14 | import './video-privacy' |
19 | import './video-schedule-update' | 15 | import './video-schedule-update' |
20 | import './video-transcoder' | ||
21 | import './videos-common-filters' | 16 | import './videos-common-filters' |
22 | import './videos-history' | 17 | import './videos-history' |
23 | import './videos-overview' | 18 | import './videos-overview' |