flushAndRunMultipleServers,
getVideo,
getVideoWithToken,
- immutableAssign,
killallServers,
makeGetRequest,
removeVideo,
uploadVideo,
viewVideo,
wait,
- waitJobs,
- waitUntilLog
+ waitJobs
} from '@shared/extra-utils'
import { VideoDetails, VideoPrivacy, VideoRedundancyStrategy, VideoRedundancyStrategyWithManual } from '@shared/models'
if (strategy !== null) {
strategies.push(
- immutableAssign({
+ {
min_lifetime: '1 hour',
strategy: strategy,
- size: '400KB'
- }, additionalParams)
+ size: '400KB',
+
+ ...additionalParams
+ }
)
}
this.timeout(80000)
await waitJobs(servers)
- await waitUntilLog(servers[0], 'Duplicated ', 5)
+ await servers[0].serversCommand.waitUntilLog('Duplicated ', 5)
await waitJobs(servers)
await check2Webseeds()
await check1WebSeed()
await check0PlaylistRedundancies()
- await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ 'videos', join('playlists', 'hls') ])
+ await checkVideoFilesWereRemoved(video1Server2UUID, servers[0], [ 'videos', join('playlists', 'hls') ])
})
after(async function () {
this.timeout(80000)
await waitJobs(servers)
- await waitUntilLog(servers[0], 'Duplicated ', 5)
+ await servers[0].serversCommand.waitUntilLog('Duplicated ', 5)
await waitJobs(servers)
await check2Webseeds()
await check1WebSeed()
await check0PlaylistRedundancies()
- await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ 'videos' ])
+ await checkVideoFilesWereRemoved(video1Server2UUID, servers[0], [ 'videos' ])
})
after(async function () {
this.timeout(80000)
await waitJobs(servers)
- await waitUntilLog(servers[0], 'Duplicated ', 5)
+ await servers[0].serversCommand.waitUntilLog('Duplicated ', 5)
await waitJobs(servers)
await check2Webseeds()
await waitJobs(servers)
for (const server of servers) {
- await checkVideoFilesWereRemoved(video1Server2UUID, server.internalServerNumber)
+ await checkVideoFilesWereRemoved(video1Server2UUID, server)
}
})
await waitJobs(servers)
await waitJobs(servers)
- await waitUntilLog(servers[0], 'Duplicated ', 1)
+ await servers[0].serversCommand.waitUntilLog('Duplicated ', 1)
await waitJobs(servers)
await check1PlaylistRedundancies()
await waitJobs(servers)
for (const server of servers) {
- await checkVideoFilesWereRemoved(video1Server2UUID, server.internalServerNumber)
+ await checkVideoFilesWereRemoved(video1Server2UUID, server)
}
})
this.timeout(80000)
await waitJobs(servers)
- await waitUntilLog(servers[0], 'Duplicated ', 5)
+ await servers[0].serversCommand.waitUntilLog('Duplicated ', 5)
await waitJobs(servers)
await check2Webseeds()
await check1WebSeed()
await check0PlaylistRedundancies()
- await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos' ])
+ await checkVideoFilesWereRemoved(video1Server2UUID, servers[0], [ 'videos' ])
})
after(async function () {
await enableRedundancyOnServer1()
await waitJobs(servers)
- await waitUntilLog(servers[0], 'Duplicated ', 5)
+ await servers[0].serversCommand.waitUntilLog('Duplicated ', 5)
await waitJobs(servers)
await check2Webseeds(video1Server2UUID)
await waitJobs(servers)
- await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ join('redundancy', 'hls') ])
+ await checkVideoFilesWereRemoved(video1Server2UUID, servers[0], [ join('redundancy', 'hls') ])
})
after(async function () {