diff options
author | Chocobozzz <me@florianbigard.com> | 2021-07-08 11:17:55 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-07-20 15:27:17 +0200 |
commit | e3d15a6a9aed97a004d9dac1b7a6499d794e080a (patch) | |
tree | 7637ac85a8659a66a1290c9533e0206e9a0c5a30 /server/tests/api/live | |
parent | a1637fa1e25b60a88f7cfe50aac8953f50d55761 (diff) | |
download | PeerTube-e3d15a6a9aed97a004d9dac1b7a6499d794e080a.tar.gz PeerTube-e3d15a6a9aed97a004d9dac1b7a6499d794e080a.tar.zst PeerTube-e3d15a6a9aed97a004d9dac1b7a6499d794e080a.zip |
Introduce blacklist command
Diffstat (limited to 'server/tests/api/live')
-rw-r--r-- | server/tests/api/live/live-save-replay.ts | 5 | ||||
-rw-r--r-- | server/tests/api/live/live.ts | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/server/tests/api/live/live-save-replay.ts b/server/tests/api/live/live-save-replay.ts index 9acd5601d..363fb561c 100644 --- a/server/tests/api/live/live-save-replay.ts +++ b/server/tests/api/live/live-save-replay.ts | |||
@@ -6,7 +6,6 @@ import { FfmpegCommand } from 'fluent-ffmpeg' | |||
6 | import { LiveVideoCreate, VideoDetails, VideoPrivacy, VideoState } from '@shared/models' | 6 | import { LiveVideoCreate, VideoDetails, VideoPrivacy, VideoState } from '@shared/models' |
7 | import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' | 7 | import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' |
8 | import { | 8 | import { |
9 | addVideoToBlacklist, | ||
10 | checkLiveCleanup, | 9 | checkLiveCleanup, |
11 | cleanupTests, | 10 | cleanupTests, |
12 | ConfigCommand, | 11 | ConfigCommand, |
@@ -172,7 +171,7 @@ describe('Save replay setting', function () { | |||
172 | await checkVideosExist(liveVideoUUID, true, HttpStatusCode.OK_200) | 171 | await checkVideosExist(liveVideoUUID, true, HttpStatusCode.OK_200) |
173 | 172 | ||
174 | await Promise.all([ | 173 | await Promise.all([ |
175 | addVideoToBlacklist(servers[0].url, servers[0].accessToken, liveVideoUUID, 'bad live', true), | 174 | servers[0].blacklistCommand.add({ videoId: liveVideoUUID, reason: 'bad live', unfederate: true }), |
176 | testFfmpegStreamError(ffmpegCommand, true) | 175 | testFfmpegStreamError(ffmpegCommand, true) |
177 | ]) | 176 | ]) |
178 | 177 | ||
@@ -280,7 +279,7 @@ describe('Save replay setting', function () { | |||
280 | await checkVideosExist(liveVideoUUID, true, HttpStatusCode.OK_200) | 279 | await checkVideosExist(liveVideoUUID, true, HttpStatusCode.OK_200) |
281 | 280 | ||
282 | await Promise.all([ | 281 | await Promise.all([ |
283 | addVideoToBlacklist(servers[0].url, servers[0].accessToken, liveVideoUUID, 'bad live', true), | 282 | servers[0].blacklistCommand.add({ videoId: liveVideoUUID, reason: 'bad live', unfederate: true }), |
284 | testFfmpegStreamError(ffmpegCommand, true) | 283 | testFfmpegStreamError(ffmpegCommand, true) |
285 | ]) | 284 | ]) |
286 | 285 | ||
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index 5d70d8513..cb52e4431 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts | |||
@@ -7,7 +7,6 @@ import { ffprobePromise, getVideoStreamFromFile } from '@server/helpers/ffprobe- | |||
7 | import { LiveVideo, LiveVideoCreate, Video, VideoDetails, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@shared/models' | 7 | import { LiveVideo, LiveVideoCreate, Video, VideoDetails, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@shared/models' |
8 | import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' | 8 | import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' |
9 | import { | 9 | import { |
10 | addVideoToBlacklist, | ||
11 | buildServerDirectory, | 10 | buildServerDirectory, |
12 | checkLiveCleanup, | 11 | checkLiveCleanup, |
13 | checkLiveSegmentHash, | 12 | checkLiveSegmentHash, |
@@ -347,7 +346,7 @@ describe('Test live', function () { | |||
347 | 346 | ||
348 | liveVideo = await createLiveWrapper() | 347 | liveVideo = await createLiveWrapper() |
349 | 348 | ||
350 | await addVideoToBlacklist(servers[0].url, servers[0].accessToken, liveVideo.uuid) | 349 | await servers[0].blacklistCommand.add({ videoId: liveVideo.uuid }) |
351 | 350 | ||
352 | const command = sendRTMPStream(rtmpUrl + '/live', liveVideo.streamKey) | 351 | const command = sendRTMPStream(rtmpUrl + '/live', liveVideo.streamKey) |
353 | await testFfmpegStreamError(command, true) | 352 | await testFfmpegStreamError(command, true) |