diff options
Diffstat (limited to 'server/tests/api/live')
-rw-r--r-- | server/tests/api/live/live-constraints.ts | 2 | ||||
-rw-r--r-- | server/tests/api/live/live-permanent.ts | 2 | ||||
-rw-r--r-- | server/tests/api/live/live-save-replay.ts | 5 | ||||
-rw-r--r-- | server/tests/api/live/live-socket-messages.ts | 2 | ||||
-rw-r--r-- | server/tests/api/live/live-views.ts | 2 | ||||
-rw-r--r-- | server/tests/api/live/live.ts | 15 |
6 files changed, 17 insertions, 11 deletions
diff --git a/server/tests/api/live/live-constraints.ts b/server/tests/api/live/live-constraints.ts index a00833569..20346113d 100644 --- a/server/tests/api/live/live-constraints.ts +++ b/server/tests/api/live/live-constraints.ts | |||
@@ -7,8 +7,8 @@ import { | |||
7 | checkLiveCleanup, | 7 | checkLiveCleanup, |
8 | cleanupTests, | 8 | cleanupTests, |
9 | ConfigCommand, | 9 | ConfigCommand, |
10 | doubleFollow, | ||
11 | createMultipleServers, | 10 | createMultipleServers, |
11 | doubleFollow, | ||
12 | PeerTubeServer, | 12 | PeerTubeServer, |
13 | setAccessTokensToServers, | 13 | setAccessTokensToServers, |
14 | setDefaultVideoChannel, | 14 | setDefaultVideoChannel, |
diff --git a/server/tests/api/live/live-permanent.ts b/server/tests/api/live/live-permanent.ts index 30d499e20..f07d4cfec 100644 --- a/server/tests/api/live/live-permanent.ts +++ b/server/tests/api/live/live-permanent.ts | |||
@@ -6,8 +6,8 @@ import { LiveVideoCreate, VideoPrivacy, VideoState } from '@shared/models' | |||
6 | import { | 6 | import { |
7 | cleanupTests, | 7 | cleanupTests, |
8 | ConfigCommand, | 8 | ConfigCommand, |
9 | doubleFollow, | ||
10 | createMultipleServers, | 9 | createMultipleServers, |
10 | doubleFollow, | ||
11 | PeerTubeServer, | 11 | PeerTubeServer, |
12 | setAccessTokensToServers, | 12 | setAccessTokensToServers, |
13 | setDefaultVideoChannel, | 13 | setDefaultVideoChannel, |
diff --git a/server/tests/api/live/live-save-replay.ts b/server/tests/api/live/live-save-replay.ts index 095c51b97..bd15396ec 100644 --- a/server/tests/api/live/live-save-replay.ts +++ b/server/tests/api/live/live-save-replay.ts | |||
@@ -3,13 +3,12 @@ | |||
3 | import 'mocha' | 3 | import 'mocha' |
4 | import * as chai from 'chai' | 4 | import * as chai from 'chai' |
5 | import { FfmpegCommand } from 'fluent-ffmpeg' | 5 | import { FfmpegCommand } from 'fluent-ffmpeg' |
6 | import { HttpStatusCode } from '@shared/models' | ||
7 | import { | 6 | import { |
8 | checkLiveCleanup, | 7 | checkLiveCleanup, |
9 | cleanupTests, | 8 | cleanupTests, |
10 | ConfigCommand, | 9 | ConfigCommand, |
11 | doubleFollow, | ||
12 | createMultipleServers, | 10 | createMultipleServers, |
11 | doubleFollow, | ||
13 | PeerTubeServer, | 12 | PeerTubeServer, |
14 | setAccessTokensToServers, | 13 | setAccessTokensToServers, |
15 | setDefaultVideoChannel, | 14 | setDefaultVideoChannel, |
@@ -18,7 +17,7 @@ import { | |||
18 | wait, | 17 | wait, |
19 | waitJobs | 18 | waitJobs |
20 | } from '@shared/extra-utils' | 19 | } from '@shared/extra-utils' |
21 | import { LiveVideoCreate, VideoPrivacy, VideoState } from '@shared/models' | 20 | import { HttpStatusCode, LiveVideoCreate, VideoPrivacy, VideoState } from '@shared/models' |
22 | 21 | ||
23 | const expect = chai.expect | 22 | const expect = chai.expect |
24 | 23 | ||
diff --git a/server/tests/api/live/live-socket-messages.ts b/server/tests/api/live/live-socket-messages.ts index 3808964d1..2a1f9f108 100644 --- a/server/tests/api/live/live-socket-messages.ts +++ b/server/tests/api/live/live-socket-messages.ts | |||
@@ -5,8 +5,8 @@ import * as chai from 'chai' | |||
5 | import { VideoPrivacy, VideoState } from '@shared/models' | 5 | import { VideoPrivacy, VideoState } from '@shared/models' |
6 | import { | 6 | import { |
7 | cleanupTests, | 7 | cleanupTests, |
8 | doubleFollow, | ||
9 | createMultipleServers, | 8 | createMultipleServers, |
9 | doubleFollow, | ||
10 | PeerTubeServer, | 10 | PeerTubeServer, |
11 | setAccessTokensToServers, | 11 | setAccessTokensToServers, |
12 | setDefaultVideoChannel, | 12 | setDefaultVideoChannel, |
diff --git a/server/tests/api/live/live-views.ts b/server/tests/api/live/live-views.ts index 4a137b185..5e3a79c64 100644 --- a/server/tests/api/live/live-views.ts +++ b/server/tests/api/live/live-views.ts | |||
@@ -6,8 +6,8 @@ import { FfmpegCommand } from 'fluent-ffmpeg' | |||
6 | import { VideoPrivacy } from '@shared/models' | 6 | import { VideoPrivacy } from '@shared/models' |
7 | import { | 7 | import { |
8 | cleanupTests, | 8 | cleanupTests, |
9 | doubleFollow, | ||
10 | createMultipleServers, | 9 | createMultipleServers, |
10 | doubleFollow, | ||
11 | PeerTubeServer, | 11 | PeerTubeServer, |
12 | setAccessTokensToServers, | 12 | setAccessTokensToServers, |
13 | setDefaultVideoChannel, | 13 | setDefaultVideoChannel, |
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index 88995910c..4676a840a 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts | |||
@@ -4,19 +4,18 @@ import 'mocha' | |||
4 | import * as chai from 'chai' | 4 | import * as chai from 'chai' |
5 | import { join } from 'path' | 5 | import { join } from 'path' |
6 | import { ffprobePromise, getVideoStreamFromFile } from '@server/helpers/ffprobe-utils' | 6 | import { ffprobePromise, getVideoStreamFromFile } from '@server/helpers/ffprobe-utils' |
7 | import { HttpStatusCode } from '@shared/models' | ||
8 | import { | 7 | import { |
9 | checkLiveCleanup, | 8 | checkLiveCleanup, |
10 | checkLiveSegmentHash, | 9 | checkLiveSegmentHash, |
11 | checkResolutionsInMasterPlaylist, | 10 | checkResolutionsInMasterPlaylist, |
12 | cleanupTests, | 11 | cleanupTests, |
13 | doubleFollow, | ||
14 | createMultipleServers, | 12 | createMultipleServers, |
13 | doubleFollow, | ||
15 | killallServers, | 14 | killallServers, |
16 | LiveCommand, | 15 | LiveCommand, |
17 | makeRawRequest, | 16 | makeRawRequest, |
18 | sendRTMPStream, | ||
19 | PeerTubeServer, | 17 | PeerTubeServer, |
18 | sendRTMPStream, | ||
20 | setAccessTokensToServers, | 19 | setAccessTokensToServers, |
21 | setDefaultVideoChannel, | 20 | setDefaultVideoChannel, |
22 | stopFfmpeg, | 21 | stopFfmpeg, |
@@ -26,7 +25,15 @@ import { | |||
26 | waitJobs, | 25 | waitJobs, |
27 | waitUntilLivePublishedOnAllServers | 26 | waitUntilLivePublishedOnAllServers |
28 | } from '@shared/extra-utils' | 27 | } from '@shared/extra-utils' |
29 | import { LiveVideo, LiveVideoCreate, VideoDetails, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@shared/models' | 28 | import { |
29 | HttpStatusCode, | ||
30 | LiveVideo, | ||
31 | LiveVideoCreate, | ||
32 | VideoDetails, | ||
33 | VideoPrivacy, | ||
34 | VideoState, | ||
35 | VideoStreamingPlaylistType | ||
36 | } from '@shared/models' | ||
30 | 37 | ||
31 | const expect = chai.expect | 38 | const expect = chai.expect |
32 | 39 | ||