import 'mocha'
import * as chai from 'chai'
-import { waitJobs } from '../../../shared/extra-utils/server/jobs'
+import { createFile, readdir } from 'fs-extra'
+import { join } from 'path'
+import { buildUUID } from '@server/helpers/uuid'
+import { HttpStatusCode } from '@shared/core-utils'
import {
buildServerDirectory,
cleanupTests,
- createVideoPlaylist,
+ CLICommand,
doubleFollow,
- execCLI,
flushAndRunMultipleServers,
- getAccount,
- getEnvCli,
+ killallServers,
makeGetRequest,
ServerInfo,
setAccessTokensToServers,
setDefaultVideoChannel,
updateMyAvatar,
uploadVideo,
- wait
-} from '../../../shared/extra-utils'
-import { Account, VideoPlaylistPrivacy } from '../../../shared/models'
-import { createFile, readdir } from 'fs-extra'
-import * as uuidv4 from 'uuid/v4'
-import { join } from 'path'
+ wait,
+ waitJobs
+} from '@shared/extra-utils'
+import { VideoPlaylistPrivacy } from '@shared/models'
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)
await updateMyAvatar({ url: server.url, accessToken: server.accessToken, fixture: 'avatar.png' })
- await createVideoPlaylist({
- url: server.url,
- token: server.accessToken,
- playlistAttrs: {
+ await server.playlistsCommand.create({
+ attributes: {
displayName: 'playlist',
privacy: VideoPlaylistPrivacy.PUBLIC,
videoChannelId: server.videoChannel.id,
// Lazy load the remote avatar
{
- const res = await getAccount(servers[0].url, 'root@localhost:' + servers[1].port)
- const account: Account = res.body
+ const account = await servers[0].accountsCommand.get({ accountName: 'root@localhost:' + servers[1].port })
await makeGetRequest({
url: servers[0].url,
path: account.avatar.path,
- statusCodeExpected: 200
+ statusCodeExpected: HttpStatusCode.OK_200
})
}
{
- const res = await getAccount(servers[1].url, 'root@localhost:' + servers[0].port)
- const account: Account = res.body
+ const account = await servers[1].accountsCommand.get({ accountName: 'root@localhost:' + servers[0].port })
await makeGetRequest({
url: servers[1].url,
path: account.avatar.path,
- statusCodeExpected: 200
+ statusCodeExpected: HttpStatusCode.OK_200
})
}
await wait(1000)
await waitJobs(servers)
+ await killallServers(servers)
+
+ await wait(1000)
})
it('Should have the files on the disk', async 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'
+ const n1 = buildUUID() + '.mp4'
+ const n2 = buildUUID() + '.webm'
await createFile(join(base, n1))
await createFile(join(base, n2))
}
{
- const base = buildServerDirectory(servers[0].internalServerNumber, 'torrents')
+ const base = buildServerDirectory(servers[0], 'torrents')
- const n1 = uuidv4() + '-240.torrent'
- const n2 = uuidv4() + '-480.torrent'
+ const n1 = buildUUID() + '-240.torrent'
+ const n2 = buildUUID() + '-480.torrent'
await createFile(join(base, n1))
await createFile(join(base, n2))
}
{
- const base = buildServerDirectory(servers[0].internalServerNumber, 'thumbnails')
+ const base = buildServerDirectory(servers[0], 'thumbnails')
- const n1 = uuidv4() + '.jpg'
- const n2 = uuidv4() + '.jpg'
+ const n1 = buildUUID() + '.jpg'
+ const n2 = buildUUID() + '.jpg'
await createFile(join(base, n1))
await createFile(join(base, n2))
}
{
- const base = buildServerDirectory(servers[0].internalServerNumber, 'previews')
+ const base = buildServerDirectory(servers[0], 'previews')
- const n1 = uuidv4() + '.jpg'
- const n2 = uuidv4() + '.jpg'
+ const n1 = buildUUID() + '.jpg'
+ const n2 = buildUUID() + '.jpg'
await createFile(join(base, n1))
await createFile(join(base, n2))
}
{
- const base = buildServerDirectory(servers[0].internalServerNumber, 'avatars')
+ const base = buildServerDirectory(servers[0], 'avatars')
- const n1 = uuidv4() + '.png'
- const n2 = uuidv4() + '.jpg'
+ const n1 = buildUUID() + '.png'
+ const n2 = buildUUID() + '.jpg'
await createFile(join(base, n1))
await createFile(join(base, n2))
it('Should run prune storage', async function () {
this.timeout(30000)
- const env = getEnvCli(servers[0])
- await execCLI(`echo y | ${env} npm run prune-storage`)
+ const env = servers[0].cliCommand.getEnv()
+ await CLICommand.exec(`echo y | ${env} npm run prune-storage`)
})
it('Should have removed files', async function () {