X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fvideo-captions.ts;h=5e13f59490b6db178e516c6f836919213621ebdc;hb=ffc65cbd2a3d8b0b41243baec9936272592137e3;hp=6e441410d3fb1e9e4143b829e6b5639796a1c24c;hpb=59c76ffa8f503e962d517c78f033f1beccb1de1a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/videos/video-captions.ts b/server/tests/api/videos/video-captions.ts index 6e441410d..5e13f5949 100644 --- a/server/tests/api/videos/video-captions.ts +++ b/server/tests/api/videos/video-captions.ts @@ -2,10 +2,22 @@ import * as chai from 'chai' import 'mocha' -import { checkVideoFilesWereRemoved, doubleFollow, flushAndRunMultipleServers, removeVideo, uploadVideo, wait } from '../../utils' -import { flushTests, killallServers, ServerInfo, setAccessTokensToServers } from '../../utils/index' -import { waitJobs } from '../../utils/server/jobs' -import { createVideoCaption, deleteVideoCaption, listVideoCaptions, testCaptionFile } from '../../utils/videos/video-captions' +import { + checkVideoFilesWereRemoved, cleanupTests, + doubleFollow, + flushAndRunMultipleServers, + removeVideo, + uploadVideo, + wait +} from '../../../../shared/extra-utils' +import { flushTests, killallServers, ServerInfo, setAccessTokensToServers } from '../../../../shared/extra-utils/index' +import { waitJobs } from '../../../../shared/extra-utils/server/jobs' +import { + createVideoCaption, + deleteVideoCaption, + listVideoCaptions, + testCaptionFile +} from '../../../../shared/extra-utils/videos/video-captions' import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' const expect = chai.expect @@ -17,8 +29,6 @@ describe('Test video captions', function () { before(async function () { this.timeout(30000) - await flushTests() - servers = await flushAndRunMultipleServers(2) await setAccessTokensToServers(servers) @@ -186,6 +196,6 @@ describe('Test video captions', function () { }) after(async function () { - killallServers(servers) + await cleanupTests(servers) }) })