From 78d62f4d182be2f72f4901c38a0d10bb147896e8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 13 Jan 2021 09:38:19 +0100 Subject: Fix and add skipping ping log tests --- server/tests/api/server/logs.ts | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'server/tests/api') diff --git a/server/tests/api/server/logs.ts b/server/tests/api/server/logs.ts index b8714c7a1..c458789b6 100644 --- a/server/tests/api/server/logs.ts +++ b/server/tests/api/server/logs.ts @@ -2,7 +2,7 @@ import * as chai from 'chai' import 'mocha' -import { cleanupTests, flushAndRunServer, ServerInfo, setAccessTokensToServers } from '../../../../shared/extra-utils/index' +import { cleanupTests, flushAndRunServer, killallServers, makeGetRequest, makePingRequest, reRunServer, ServerInfo, setAccessTokensToServers } from '../../../../shared/extra-utils/index' import { waitJobs } from '../../../../shared/extra-utils/server/jobs' import { uploadVideo } from '../../../../shared/extra-utils/videos/videos' import { getAuditLogs, getLogs } from '../../../../shared/extra-utils/logs/logs' @@ -20,6 +20,7 @@ describe('Test logs', function () { }) describe('With the standard log file', function () { + it('Should get logs with a start date', async function () { this.timeout(10000) @@ -84,6 +85,34 @@ describe('Test logs', function () { expect(logsString.includes('video 6')).to.be.false } }) + + it('Should log ping requests', async function () { + const now = new Date() + + await makePingRequest(server) + + const res = await getLogs(server.url, server.accessToken, now, undefined, 'info') + const logsString = JSON.stringify(res.body) + + expect(logsString.includes('/api/v1/ping')).to.be.true + }) + + it('Should not log ping requests', async function () { + this.timeout(30000) + + killallServers([ server ]) + + await reRunServer(server, { log: { log_ping_requests: false } }) + + const now = new Date() + + await makePingRequest(server) + + const res = await getLogs(server.url, server.accessToken, now, undefined, 'info') + const logsString = JSON.stringify(res.body) + + expect(logsString.includes('/api/v1/ping')).to.be.false + }) }) describe('With the audit log', function () { -- cgit v1.2.3