Fix misc tests

[github/Chocobozzz/PeerTube.git] / server / tests / api / server / logs.ts

diff --git a/server/tests/api/server/logs.ts b/server/tests/api/server/logs.ts
index 05b0308deba1c82cc110b37eba8362863f74716f..68f4421993ed276852720bcfe79ca13233ffac8f 100644 (file)
--- a/server/tests/api/server/logs.ts
+++ b/server/tests/api/server/logs.ts
@@ -2,10 +2,17 @@
 
 import * as chai from 'chai'
 import 'mocha'
-import { flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers } from '../../../../shared/utils/index'
-import { waitJobs } from '../../../../shared/utils/server/jobs'
-import { uploadVideo } from '../../../../shared/utils/videos/videos'
-import { getLogs } from '../../../../shared/utils/logs/logs'
+import {
+  flushTests,
+  killallServers,
+  flushAndRunServer,
+  ServerInfo,
+  setAccessTokensToServers,
+  cleanupTests
+} from '../../../../shared/extra-utils/index'
+import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
+import { uploadVideo } from '../../../../shared/extra-utils/videos/videos'
+import { getLogs } from '../../../../shared/extra-utils/logs/logs'
 
 const expect = chai.expect
 
@@ -15,9 +22,7 @@ describe('Test logs', function () {
   before(async function () {
     this.timeout(30000)
 
-    await flushTests()
-
-    server = await runServer(1)
+    server = await flushAndRunServer(1)
     await setAccessTokensToServers([ server ])
   })
 
@@ -40,7 +45,7 @@ describe('Test logs', function () {
   })
 
   it('Should get logs with an end date', async function () {
-    this.timeout(10000)
+    this.timeout(20000)
 
     await uploadVideo(server.url, server.accessToken, { name: 'video 3' })
     await waitJobs([ server ])
@@ -87,6 +92,6 @@ describe('Test logs', function () {
   })
 
   after(async function () {
-    killallServers([ server ])
+    await cleanupTests([ server ])
   })
 })