Merge branch 'release/1.4.0' into develop

[github/Chocobozzz/PeerTube.git] / server / tests / api / check-params / debug.ts

diff --git a/server/tests/api/check-params/debug.ts b/server/tests/api/check-params/debug.ts
index da94beffeb70f7befdbe3679f9d20149081e7466..8dad267233f01fbc26c10d8df208ec5a2205f94d 100644 (file)
--- a/server/tests/api/check-params/debug.ts
+++ b/server/tests/api/check-params/debug.ts
@@ -6,12 +6,12 @@ import {
   createUser,
   flushTests,
   killallServers,
-  runServer,
+  flushAndRunServer,
   ServerInfo,
   setAccessTokensToServers,
-  userLogin
-} from '../../../../shared/utils'
-import { makeGetRequest } from '../../../../shared/utils/requests/requests'
+  userLogin, cleanupTests
+} from '../../../../shared/extra-utils'
+import { makeGetRequest } from '../../../../shared/extra-utils/requests/requests'
 
 describe('Test debug API validators', function () {
   const path = '/api/v1/server/debug'
@@ -23,9 +23,7 @@ describe('Test debug API validators', function () {
   before(async function () {
     this.timeout(120000)
 
-    await flushTests()
-
-    server = await runServer(1)
+    server = await flushAndRunServer(1)
 
     await setAccessTokensToServers([ server ])
 
@@ -68,11 +66,6 @@ describe('Test debug API validators', function () {
   })
 
   after(async function () {
-    killallServers([ server ])
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
+    await cleanupTests([ server ])
   })
 })