import { buildUUID } from '@server/helpers/uuid'
import { HttpStatusCode } from '@shared/core-utils'
import {
- buildServerDirectory,
cleanupTests,
CLICommand,
doubleFollow,
- flushAndRunMultipleServers,
+ createMultipleServers,
killallServers,
makeGetRequest,
- ServerInfo,
+ PeerTubeServer,
setAccessTokensToServers,
setDefaultVideoChannel,
- updateMyAvatar,
- uploadVideo,
wait,
waitJobs
} from '@shared/extra-utils'
const expect = chai.expect
-async function countFiles (internalServerNumber: number, directory: string) {
- const files = await readdir(buildServerDirectory({ internalServerNumber }, directory))
+async function countFiles (server: PeerTubeServer, directory: string) {
+ const files = await readdir(server.servers.buildDirectory(directory))
return files.length
}
-async function assertNotExists (internalServerNumber: number, directory: string, substring: string) {
- const files = await readdir(buildServerDirectory({ internalServerNumber }, directory))
+async function assertNotExists (server: PeerTubeServer, directory: string, substring: string) {
+ const files = await readdir(server.servers.buildDirectory(directory))
for (const f of files) {
expect(f).to.not.contain(substring)
}
}
-async function assertCountAreOkay (servers: ServerInfo[]) {
+async function assertCountAreOkay (servers: PeerTubeServer[]) {
for (const server of servers) {
- const videosCount = await countFiles(server.internalServerNumber, 'videos')
+ const videosCount = await countFiles(server, 'videos')
expect(videosCount).to.equal(8)
- const torrentsCount = await countFiles(server.internalServerNumber, 'torrents')
+ const torrentsCount = await countFiles(server, 'torrents')
expect(torrentsCount).to.equal(16)
- const previewsCount = await countFiles(server.internalServerNumber, 'previews')
+ const previewsCount = await countFiles(server, 'previews')
expect(previewsCount).to.equal(2)
- const thumbnailsCount = await countFiles(server.internalServerNumber, 'thumbnails')
+ const thumbnailsCount = await countFiles(server, 'thumbnails')
expect(thumbnailsCount).to.equal(6)
- const avatarsCount = await countFiles(server.internalServerNumber, 'avatars')
+ const avatarsCount = await countFiles(server, 'avatars')
expect(avatarsCount).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)
for (const server of servers) {
- await uploadVideo(server.url, server.accessToken, { name: 'video 1' })
- await uploadVideo(server.url, server.accessToken, { name: 'video 2' })
+ await server.videos.upload({ attributes: { name: 'video 1' } })
+ await server.videos.upload({ attributes: { name: 'video 2' } })
- await updateMyAvatar({ url: server.url, accessToken: server.accessToken, fixture: 'avatar.png' })
+ await server.users.updateMyAvatar({ fixture: 'avatar.png' })
- await server.playlistsCommand.create({
+ await server.playlists.create({
attributes: {
displayName: 'playlist',
privacy: VideoPlaylistPrivacy.PUBLIC,
- videoChannelId: server.videoChannel.id,
+ videoChannelId: server.store.channel.id,
thumbnailfile: 'thumbnail.jpg'
}
})
// Lazy load the remote avatar
{
- const account = await servers[0].accountsCommand.get({ accountName: 'root@localhost:' + servers[1].port })
+ const account = await servers[0].accounts.get({ accountName: 'root@localhost:' + servers[1].port })
await makeGetRequest({
url: servers[0].url,
path: account.avatar.path,
}
{
- const account = await servers[1].accountsCommand.get({ accountName: 'root@localhost:' + servers[0].port })
+ const account = await servers[1].accounts.get({ accountName: 'root@localhost:' + servers[0].port })
await makeGetRequest({
url: servers[1].url,
path: account.avatar.path,
await wait(1000)
await waitJobs(servers)
- killallServers(servers)
+ await killallServers(servers)
await wait(1000)
})
it('Should create some dirty files', async function () {
for (let i = 0; i < 2; i++) {
{
- const base = buildServerDirectory(servers[0], 'videos')
+ const base = servers[0].servers.buildDirectory('videos')
const n1 = buildUUID() + '.mp4'
const n2 = buildUUID() + '.webm'
}
{
- const base = buildServerDirectory(servers[0], 'torrents')
+ const base = servers[0].servers.buildDirectory('torrents')
const n1 = buildUUID() + '-240.torrent'
const n2 = buildUUID() + '-480.torrent'
}
{
- const base = buildServerDirectory(servers[0], 'thumbnails')
+ const base = servers[0].servers.buildDirectory('thumbnails')
const n1 = buildUUID() + '.jpg'
const n2 = buildUUID() + '.jpg'
}
{
- const base = buildServerDirectory(servers[0], 'previews')
+ const base = servers[0].servers.buildDirectory('previews')
const n1 = buildUUID() + '.jpg'
const n2 = buildUUID() + '.jpg'
}
{
- const base = buildServerDirectory(servers[0], 'avatars')
+ const base = servers[0].servers.buildDirectory('avatars')
const n1 = buildUUID() + '.png'
const n2 = buildUUID() + '.jpg'
it('Should run prune storage', async function () {
this.timeout(30000)
- const env = servers[0].cliCommand.getEnv()
+ const env = servers[0].cli.getEnv()
await CLICommand.exec(`echo y | ${env} npm run prune-storage`)
})
for (const directory of Object.keys(badNames)) {
for (const name of badNames[directory]) {
- await assertNotExists(servers[0].internalServerNumber, directory, name)
+ await assertNotExists(servers[0], directory, name)
}
}
})