Fix viewers tests

This commit is contained in:
Chocobozzz 2025-01-27 16:15:58 +01:00
parent 962d3401a1
commit 322748483f
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 14 additions and 14 deletions

View File

@ -18,11 +18,11 @@ import { FfmpegCommand } from 'fluent-ffmpeg'
* * user4 started and ended after end date
*/
async function simulateComplexViewers (servers: PeerTubeServer[], videoUUID: string, useSessionId: boolean) {
const user0 = '8.8.8.8,127.0.0.1'
const user1 = '8.8.8.8,127.0.0.1'
const user2 = '8.8.8.9,127.0.0.1'
const user3 = '8.8.8.10,127.0.0.1'
const user4 = '8.8.8.11,127.0.0.1'
const user0 = '8-8-8-8-127-0-0-1'
const user1 = '8-8-8-8-127-0-0-1'
const user2 = '8-8-8-9-127-0-0-1'
const user3 = '8-8-8-10-127-0-0-1'
const user4 = '8-8-8-11-127-0-0-1'
const sessionIdField = useSessionId
? 'sessionId'

View File

@ -40,15 +40,15 @@ describe('Test views retention stats', function () {
})
it('Should display appropriate retention metrics', async function () {
await servers[0].views.simulateViewer({ [sessionField]: '127.0.0.2,127.0.0.1', id: vodVideoId, currentTimes: [ 0, 1 ] })
await servers[0].views.simulateViewer({ [sessionField]: '127.0.0.3,127.0.0.1', id: vodVideoId, currentTimes: [ 1, 3 ] })
await servers[1].views.simulateViewer({ [sessionField]: '127.0.0.2,127.0.0.1', id: vodVideoId, currentTimes: [ 3, 4 ] })
await servers[1].views.simulateViewer({ [sessionField]: '127.0.0.3,127.0.0.1', id: vodVideoId, currentTimes: [ 0, 1 ] })
await servers[0].views.simulateViewer({ [sessionField]: '127-0-0-2-127-0-0-1', id: vodVideoId, currentTimes: [ 0, 1 ] })
await servers[0].views.simulateViewer({ [sessionField]: '127-0-0-3-127-0-0-1', id: vodVideoId, currentTimes: [ 1, 3 ] })
await servers[1].views.simulateViewer({ [sessionField]: '127-0-0-2-127-0-0-1', id: vodVideoId, currentTimes: [ 3, 4 ] })
await servers[1].views.simulateViewer({ [sessionField]: '127-0-0-3-127-0-0-1', id: vodVideoId, currentTimes: [ 0, 1 ] })
// Do not take into account empty section
await servers[1].views.simulateViewer({ [sessionField]: '127.0.0.3,127.0.0.1', id: vodVideoId, currentTimes: [ 5, 5 ] })
await servers[0].views.simulateViewer({ [sessionField]: '127.0.0.4,127.0.0.1', id: vodVideoId, currentTimes: [ 1, 1 ] })
await servers[1].views.simulateViewer({ [sessionField]: '127.0.0.4,127.0.0.1', id: vodVideoId, currentTimes: [ 1, 1 ] })
await servers[1].views.simulateViewer({ [sessionField]: '127-0-0-3-127-0-0-1', id: vodVideoId, currentTimes: [ 5, 5 ] })
await servers[0].views.simulateViewer({ [sessionField]: '127-0-0-4-127-0-0-1', id: vodVideoId, currentTimes: [ 1, 1 ] })
await servers[1].views.simulateViewer({ [sessionField]: '127-0-0-4-127-0-0-1', id: vodVideoId, currentTimes: [ 1, 1 ] })
await processViewersStats(servers)
@ -63,8 +63,8 @@ describe('Test views retention stats', function () {
const newVideo = await servers[0].videos.quickUpload({ name: 'video 2' })
await servers[0].views.simulateViewer({ [sessionField]: '127.0.0.2,127.0.0.1', id: newVideo.id, currentTimes: [ 0, 1 ] })
await servers[0].views.simulateViewer({ [sessionField]: '127.0.0.3,127.0.0.1', id: newVideo.id, currentTimes: [ 1, 3 ] })
await servers[0].views.simulateViewer({ [sessionField]: '127-0-0-2-127-0-0-1', id: newVideo.id, currentTimes: [ 0, 1 ] })
await servers[0].views.simulateViewer({ [sessionField]: '127-0-0-3-127-0-0-1', id: newVideo.id, currentTimes: [ 1, 3 ] })
await wait(2500)