From ffc65cbd2a3d8b0b41243baec9936272592137e3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 24 Jan 2020 16:48:05 +0100 Subject: Remove HLS torrents --- server/tests/api/redundancy/redundancy.ts | 8 ++++---- server/tests/api/videos/multiple-servers.ts | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'server/tests') diff --git a/server/tests/api/redundancy/redundancy.ts b/server/tests/api/redundancy/redundancy.ts index be24eb32f..1cdf93aa1 100644 --- a/server/tests/api/redundancy/redundancy.ts +++ b/server/tests/api/redundancy/redundancy.ts @@ -318,7 +318,7 @@ describe('Test videos redundancy', function () { await check1WebSeed() await check0PlaylistRedundancies() - await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos', join('playlists', 'hls') ]) + await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ 'videos', join('playlists', 'hls') ]) }) after(async function () { @@ -368,7 +368,7 @@ describe('Test videos redundancy', function () { await check1WebSeed() await check0PlaylistRedundancies() - await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos' ]) + await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ 'videos' ]) }) after(async function () { @@ -437,7 +437,7 @@ describe('Test videos redundancy', function () { await waitJobs(servers) for (const server of servers) { - await checkVideoFilesWereRemoved(video1Server2UUID, server.serverNumber) + await checkVideoFilesWereRemoved(video1Server2UUID, server.internalServerNumber) } }) @@ -572,7 +572,7 @@ describe('Test videos redundancy', function () { await waitJobs(servers) - await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ join('redundancy', 'hls') ]) + await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ join('redundancy', 'hls') ]) }) after(async function () { diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index 22d87b88c..fa3e250ec 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -15,7 +15,6 @@ import { createUser, dateIsValid, doubleFollow, - flushAndRunServer, flushAndRunMultipleServers, getLocalVideos, getVideo, @@ -697,8 +696,8 @@ describe('Test multiple servers', function () { it('Should not have files of videos 3 and 3-2 on each server', async function () { for (const server of servers) { - await checkVideoFilesWereRemoved(toRemove[0].uuid, server.serverNumber) - await checkVideoFilesWereRemoved(toRemove[1].uuid, server.serverNumber) + await checkVideoFilesWereRemoved(toRemove[0].uuid, server.internalServerNumber) + await checkVideoFilesWereRemoved(toRemove[1].uuid, server.internalServerNumber) } }) -- cgit v1.2.3