X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Flogs.ts;h=bc398ea731ac04bd8479fa1114703edb62c11a91;hb=693c6586cb896a84ff0f897b1c242bcf7bdcbaee;hp=b8714c7a104df5a4c90790a591f4380fb72e4a0b;hpb=7024e9120b381b5b3201212f5a18f5cdc14e15ff;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/server/logs.ts b/server/tests/api/server/logs.ts
index b8714c7a1..bc398ea73 100644
--- a/server/tests/api/server/logs.ts
+++ b/server/tests/api/server/logs.ts
@@ -1,11 +1,19 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
-import { cleanupTests, flushAndRunServer, ServerInfo, setAccessTokensToServers } from '../../../../shared/extra-utils/index'
+import * as chai from 'chai'
+import {
+  cleanupTests,
+  flushAndRunServer,
+  killallServers,
+  makePingRequest,
+  reRunServer,
+  ServerInfo,
+  setAccessTokensToServers
+} from '../../../../shared/extra-utils/index'
+import { getAuditLogs, getLogs } from '../../../../shared/extra-utils/logs/logs'
 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'
 
 const expect = chai.expect
 
@@ -20,8 +28,9 @@ describe('Test logs', function () {
   })
 
   describe('With the standard log file', function () {
+
     it('Should get logs with a start date', async function () {
-      this.timeout(10000)
+      this.timeout(20000)
 
       await uploadVideo(server.url, server.accessToken, { name: 'video 1' })
       await waitJobs([ server ])
@@ -39,7 +48,7 @@ describe('Test logs', function () {
     })
 
     it('Should get logs with an end date', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       await uploadVideo(server.url, server.accessToken, { name: 'video 3' })
       await waitJobs([ server ])
@@ -63,7 +72,7 @@ describe('Test logs', function () {
     })
 
     it('Should get filter by level', async function () {
-      this.timeout(10000)
+      this.timeout(20000)
 
       const now = new Date()
 
@@ -84,11 +93,41 @@ describe('Test logs', function () {
         expect(logsString.includes('video 6')).to.be.false
       }
     })
+
+    it('Should log ping requests', async function () {
+      this.timeout(10000)
+
+      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 () {
     it('Should get logs with a start date', async function () {
-      this.timeout(10000)
+      this.timeout(20000)
 
       await uploadVideo(server.url, server.accessToken, { name: 'video 7' })
       await waitJobs([ server ])
@@ -114,7 +153,7 @@ describe('Test logs', function () {
     })
 
     it('Should get logs with an end date', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       await uploadVideo(server.url, server.accessToken, { name: 'video 9' })
       await waitJobs([ server ])