/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import 'mocha'
-import * as chai from 'chai'
+import { expect } from 'chai'
import { createFile, readdir } from 'fs-extra'
import { join } from 'path'
-import { buildUUID } from '@server/helpers/uuid'
-import { HttpStatusCode } from '@shared/core-utils'
+import { wait } from '@shared/core-utils'
+import { buildUUID } from '@shared/extra-utils'
+import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models'
import {
cleanupTests,
CLICommand,
+ createMultipleServers,
doubleFollow,
- flushAndRunMultipleServers,
killallServers,
makeGetRequest,
- ServerInfo,
+ PeerTubeServer,
setAccessTokensToServers,
setDefaultVideoChannel,
- wait,
waitJobs
-} from '@shared/extra-utils'
-import { VideoPlaylistPrivacy } from '@shared/models'
+} from '@shared/server-commands'
-const expect = chai.expect
-
-async function countFiles (server: ServerInfo, directory: string) {
+async function countFiles (server: PeerTubeServer, directory: string) {
const files = await readdir(server.servers.buildDirectory(directory))
return files.length
}
-async function assertNotExists (server: ServerInfo, directory: string, substring: string) {
+async function assertNotExists (server: PeerTubeServer, directory: string, substring: string) {
const files = await readdir(server.servers.buildDirectory(directory))
for (const f of files) {
}
}
-async function assertCountAreOkay (servers: ServerInfo[]) {
+async function assertCountAreOkay (servers: PeerTubeServer[]) {
for (const server of servers) {
const videosCount = await countFiles(server, 'videos')
expect(videosCount).to.equal(8)
expect(thumbnailsCount).to.equal(6)
const avatarsCount = await countFiles(server, 'avatars')
- expect(avatarsCount).to.equal(2)
+ expect(avatarsCount).to.equal(4)
+
+ const hlsRootCount = await countFiles(server, 'streaming-playlists/hls')
+ expect(hlsRootCount).to.equal(2)
}
}
describe('Test prune storage scripts', function () {
- let servers: ServerInfo[]
+ let servers: PeerTubeServer[]
const badNames: { [directory: string]: string[] } = {}
before(async function () {
this.timeout(120000)
- servers = await flushAndRunMultipleServers(2, { transcoding: { enabled: true } })
+ servers = await createMultipleServers(2, { transcoding: { enabled: true } })
await setAccessTokensToServers(servers)
await setDefaultVideoChannel(servers)
await doubleFollow(servers[0], servers[1])
- // Lazy load the remote avatar
+ // Lazy load the remote avatars
{
const account = await servers[0].accounts.get({ accountName: 'root@localhost:' + servers[1].port })
- await makeGetRequest({
- url: servers[0].url,
- path: account.avatar.path,
- statusCodeExpected: HttpStatusCode.OK_200
- })
+
+ for (const avatar of account.avatars) {
+ await makeGetRequest({
+ url: servers[0].url,
+ path: avatar.path,
+ expectedStatus: HttpStatusCode.OK_200
+ })
+ }
}
{
const account = await servers[1].accounts.get({ accountName: 'root@localhost:' + servers[0].port })
- await makeGetRequest({
- url: servers[1].url,
- path: account.avatar.path,
- statusCodeExpected: HttpStatusCode.OK_200
- })
+ for (const avatar of account.avatars) {
+ await makeGetRequest({
+ url: servers[1].url,
+ path: avatar.path,
+ expectedStatus: HttpStatusCode.OK_200
+ })
+ }
}
await wait(1000)
badNames['avatars'] = [ n1, n2 ]
}
+
+ {
+ const directory = join('streaming-playlists', 'hls')
+ const base = servers[0].servers.buildDirectory(directory)
+
+ const n1 = buildUUID()
+ await createFile(join(base, n1))
+ badNames[directory] = [ n1 ]
+ }
}
})