Speedup CI

[github/Chocobozzz/PeerTube.git] / server / tests / cli / prune-storage.ts

diff --git a/server/tests/cli/prune-storage.ts b/server/tests/cli/prune-storage.ts
index 6cda8007093e9fedc719f529f720e140d85407d3..591ed217fa46094193416c31e399c4ddcb58d847 100644 (file)
--- a/server/tests/cli/prune-storage.ts
+++ b/server/tests/cli/prune-storage.ts
@@ -24,17 +24,18 @@ import { Account, VideoPlaylistPrivacy } from '../../../shared/models'
 import { createFile, readdir } from 'fs-extra'
 import { v4 as uuidv4 } from 'uuid'
 import { join } from 'path'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
 const expect = chai.expect
 
 async function countFiles (internalServerNumber: number, directory: string) {
-  const files = await readdir(buildServerDirectory(internalServerNumber, directory))
+  const files = await readdir(buildServerDirectory({ internalServerNumber }, directory))
 
   return files.length
 }
 
 async function assertNotExists (internalServerNumber: number, directory: string, substring: string) {
-  const files = await readdir(buildServerDirectory(internalServerNumber, directory))
+  const files = await readdir(buildServerDirectory({ internalServerNumber }, directory))
 
   for (const f of files) {
     expect(f).to.not.contain(substring)
@@ -98,7 +99,7 @@ describe('Test prune storage scripts', function () {
       await makeGetRequest({
         url: servers[0].url,
         path: account.avatar.path,
-        statusCodeExpected: 200
+        statusCodeExpected: HttpStatusCode.OK_200
       })
     }
 
@@ -108,7 +109,7 @@ describe('Test prune storage scripts', function () {
       await makeGetRequest({
         url: servers[1].url,
         path: account.avatar.path,
-        statusCodeExpected: 200
+        statusCodeExpected: HttpStatusCode.OK_200
       })
     }
 
@@ -124,7 +125,7 @@ describe('Test prune storage scripts', function () {
   it('Should create some dirty files', async function () {
     for (let i = 0; i < 2; i++) {
       {
-        const base = buildServerDirectory(servers[0].internalServerNumber, 'videos')
+        const base = buildServerDirectory(servers[0], 'videos')
 
         const n1 = uuidv4() + '.mp4'
         const n2 = uuidv4() + '.webm'
@@ -136,7 +137,7 @@ describe('Test prune storage scripts', function () {
       }
 
       {
-        const base = buildServerDirectory(servers[0].internalServerNumber, 'torrents')
+        const base = buildServerDirectory(servers[0], 'torrents')
 
         const n1 = uuidv4() + '-240.torrent'
         const n2 = uuidv4() + '-480.torrent'
@@ -148,7 +149,7 @@ describe('Test prune storage scripts', function () {
       }
 
       {
-        const base = buildServerDirectory(servers[0].internalServerNumber, 'thumbnails')
+        const base = buildServerDirectory(servers[0], 'thumbnails')
 
         const n1 = uuidv4() + '.jpg'
         const n2 = uuidv4() + '.jpg'
@@ -160,7 +161,7 @@ describe('Test prune storage scripts', function () {
       }
 
       {
-        const base = buildServerDirectory(servers[0].internalServerNumber, 'previews')
+        const base = buildServerDirectory(servers[0], 'previews')
 
         const n1 = uuidv4() + '.jpg'
         const n2 = uuidv4() + '.jpg'
@@ -172,7 +173,7 @@ describe('Test prune storage scripts', function () {
       }
 
       {
-        const base = buildServerDirectory(servers[0].internalServerNumber, 'avatars')
+        const base = buildServerDirectory(servers[0], 'avatars')
 
         const n1 = uuidv4() + '.png'
         const n2 = uuidv4() + '.jpg'