X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fcli%2Fpeertube.ts;h=80bbc98d57382a0bd1b58a48a4ccc41d88663da1;hb=7c3b79768bd174b22154e8d2df0b1211e01ee56a;hp=e5038838efcd7fc9a711aa3700a6379bf1ec45e6;hpb=9639bd175726b73f8fe664b5ced12a72407b1f0b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts
index e5038838e..80bbc98d5 100644
--- a/server/tests/cli/peertube.ts
+++ b/server/tests/cli/peertube.ts
@@ -8,10 +8,10 @@ import {
   flushTests,
   getEnvCli,
   killallServers,
-  runServer,
+  flushAndRunServer,
   ServerInfo,
-  setAccessTokensToServers
-} from '../../../shared/utils'
+  setAccessTokensToServers, cleanupTests
+} from '../../../shared/extra-utils'
 
 describe('Test CLI wrapper', function () {
   let server: ServerInfo
@@ -19,12 +19,10 @@ describe('Test CLI wrapper', function () {
 
   before(async function () {
     this.timeout(30000)
-
-    await flushTests()
-    server = await runServer(1)
+    server = await flushAndRunServer(1)
     await setAccessTokensToServers([ server ])
 
-    await createUser(server.url, server.accessToken, 'user_1', 'super password')
+    await createUser({ url: server.url, accessToken: server.accessToken, username: 'user_1', password: 'super password' })
   })
 
   it('Should display no selected instance', async function () {
@@ -44,8 +42,10 @@ describe('Test CLI wrapper', function () {
   })
 
   after(async function () {
+    this.timeout(10000)
+
     await execCLI(cmd + ` auth del ${server.url}`)
 
-    killallServers([ server ])
+    await cleanupTests([ server ])
   })
 })