X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Faccounts.ts;h=d1712cff61999ab6f19ee785bede7942b204d4de;hb=1896bca09e088b0da9d5e845407ecebae330618c;hp=68f9519c6b328e89b6b898bef290b2966bd7992b;hpb=926cd3df339772dd1cbb9e10996518e8cb2e001d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/check-params/accounts.ts b/server/tests/api/check-params/accounts.ts
index 68f9519c6..d1712cff6 100644
--- a/server/tests/api/check-params/accounts.ts
+++ b/server/tests/api/check-params/accounts.ts
@@ -1,14 +1,15 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
 
-import { flushTests, killallServers, runServer, ServerInfo } from '../../../../shared/utils'
+import { cleanupTests, flushAndRunServer, ServerInfo } from '../../../../shared/extra-utils'
 import {
   checkBadCountPagination,
   checkBadSortPagination,
   checkBadStartPagination
-} from '../../../../shared/utils/requests/check-api-params'
-import { getAccount } from '../../../../shared/utils/users/accounts'
+} from '../../../../shared/extra-utils/requests/check-api-params'
+import { getAccount } from '../../../../shared/extra-utils/users/accounts'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 
 describe('Test accounts API validators', function () {
   const path = '/api/v1/accounts/'
@@ -19,9 +20,7 @@ describe('Test accounts API validators', function () {
   before(async function () {
     this.timeout(30000)
 
-    await flushTests()
-
-    server = await runServer(1)
+    server = await flushAndRunServer(1)
   })
 
   describe('When listing accounts', function () {
@@ -40,16 +39,11 @@ describe('Test accounts API validators', function () {
 
   describe('When getting an account', function () {
     it('Should return 404 with a non existing name', async function () {
-      await getAccount(server.url, 'arfaze', 404)
+      await getAccount(server.url, 'arfaze', HttpStatusCode.NOT_FOUND_404)
     })
   })
 
   after(async function () {
-    killallServers([ server ])
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
+    await cleanupTests([ server ])
   })
 })