diff options
Diffstat (limited to 'server/tests/api/videos/video-blacklist-management.ts')
-rw-r--r-- | server/tests/api/videos/video-blacklist-management.ts | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/server/tests/api/videos/video-blacklist-management.ts b/server/tests/api/videos/video-blacklist-management.ts index db79784c2..4d1a06436 100644 --- a/server/tests/api/videos/video-blacklist-management.ts +++ b/server/tests/api/videos/video-blacklist-management.ts | |||
@@ -6,7 +6,6 @@ import 'mocha' | |||
6 | import { | 6 | import { |
7 | addVideoToBlacklist, | 7 | addVideoToBlacklist, |
8 | flushAndRunMultipleServers, | 8 | flushAndRunMultipleServers, |
9 | flushTests, | ||
10 | getBlacklistedVideosList, | 9 | getBlacklistedVideosList, |
11 | getSortedBlacklistedVideosList, | 10 | getSortedBlacklistedVideosList, |
12 | getVideosList, | 11 | getVideosList, |
@@ -14,10 +13,10 @@ import { | |||
14 | removeVideoFromBlacklist, | 13 | removeVideoFromBlacklist, |
15 | ServerInfo, | 14 | ServerInfo, |
16 | setAccessTokensToServers, | 15 | setAccessTokensToServers, |
17 | uploadVideo, | 16 | uploadVideo |
18 | wait | ||
19 | } from '../../utils/index' | 17 | } from '../../utils/index' |
20 | import { doubleFollow } from '../../utils/server/follows' | 18 | import { doubleFollow } from '../../utils/server/follows' |
19 | import { waitJobs } from '../../utils/server/jobs' | ||
21 | 20 | ||
22 | const expect = chai.expect | 21 | const expect = chai.expect |
23 | const orderBy = lodash.orderBy | 22 | const orderBy = lodash.orderBy |
@@ -51,7 +50,7 @@ describe('Test video blacklist management', function () { | |||
51 | await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 2nd video', description: 'A video on server 2' }) | 50 | await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 2nd video', description: 'A video on server 2' }) |
52 | 51 | ||
53 | // Wait videos propagation, server 2 has transcoding enabled | 52 | // Wait videos propagation, server 2 has transcoding enabled |
54 | await wait(15000) | 53 | await waitJobs(servers) |
55 | 54 | ||
56 | // Blacklist the two videos on server 1 | 55 | // Blacklist the two videos on server 1 |
57 | await blacklistVideosOnServer(servers[0]) | 56 | await blacklistVideosOnServer(servers[0]) |
@@ -154,9 +153,5 @@ describe('Test video blacklist management', function () { | |||
154 | 153 | ||
155 | after(async function () { | 154 | after(async function () { |
156 | killallServers(servers) | 155 | killallServers(servers) |
157 | |||
158 | if (this['ok']) { | ||
159 | await flushTests() | ||
160 | } | ||
161 | }) | 156 | }) |
162 | }) | 157 | }) |