import { expect } from 'chai'
import {
cleanupTests,
+ createMultipleServers,
doubleFollow,
- flushAndRunMultipleServers,
killallServers,
MockBlocklist,
- reRunServer,
- ServerInfo,
+ PeerTubeServer,
setAccessTokensToServers,
wait
} from '@shared/extra-utils'
import { Video } from '@shared/models'
-async function check (server: ServerInfo, videoUUID: string, exists = true) {
+async function check (server: PeerTubeServer, videoUUID: string, exists = true) {
const { data } = await server.videos.list()
const video = data.find(v => v.uuid === videoUUID)
}
describe('Official plugin auto-block videos', function () {
- let servers: ServerInfo[]
+ let servers: PeerTubeServer[]
let blocklistServer: MockBlocklist
let server1Videos: Video[] = []
let server2Videos: Video[] = []
before(async function () {
this.timeout(60000)
- servers = await flushAndRunMultipleServers(2)
+ servers = await createMultipleServers(2)
await setAccessTokensToServers(servers)
for (const server of servers) {
blocklistServer = new MockBlocklist()
port = await blocklistServer.initialize()
- await await servers[0].videos.quickUpload({ name: 'video server 1' })
- await await servers[1].videos.quickUpload({ name: 'video server 2' })
- await await servers[1].videos.quickUpload({ name: 'video 2 server 2' })
- await await servers[1].videos.quickUpload({ name: 'video 3 server 2' })
+ await servers[0].videos.quickUpload({ name: 'video server 1' })
+ await servers[1].videos.quickUpload({ name: 'video server 2' })
+ await servers[1].videos.quickUpload({ name: 'video 2 server 2' })
+ await servers[1].videos.quickUpload({ name: 'video 3 server 2' })
{
const { data } = await servers[0].videos.list()
await check(servers[0], video.uuid, true)
await killallServers([ servers[0] ])
- await reRunServer(servers[0])
+ await servers[0].run()
await wait(2000)
await check(servers[0], video.uuid, true)