Merge branch 'release/v1.3.0' into develop

[github/Chocobozzz/PeerTube.git] / server / tests / cli / reset-password.ts

diff --git a/server/tests/cli/reset-password.ts b/server/tests/cli/reset-password.ts
index 3c56bf45b7b4745ba7dace70dd16be6c7aea86da..6abb6738f6dbb6e9e2024f17d9b241eb215e89fe 100644 (file)
--- a/server/tests/cli/reset-password.ts
+++ b/server/tests/cli/reset-password.ts
@@ -1,13 +1,12 @@
 import 'mocha'
 
 import {
+  cleanupTests,
   createUser,
   execCLI,
-  flushTests,
+  flushAndRunServer,
   getEnvCli,
-  killallServers,
   login,
-  runServer,
   ServerInfo,
   setAccessTokensToServers
 } from '../../../shared/extra-utils'
@@ -17,9 +16,7 @@ describe('Test reset password scripts', function () {
 
   before(async function () {
     this.timeout(30000)
-
-    await flushTests()
-    server = await runServer(1)
+    server = await flushAndRunServer(1)
     await setAccessTokensToServers([ server ])
 
     await createUser({ url: server.url, accessToken: server.accessToken, username: 'user_1', password: 'super password' })
@@ -35,6 +32,6 @@ describe('Test reset password scripts', function () {
   })
 
   after(async function () {
-    killallServers([ server ])
+    await cleanupTests([ server ])
   })
 })