import 'mocha'
import { expect } from 'chai'
+import { VideoPrivacy } from '@shared/models'
import {
cleanupTests,
- flushAndRunServer,
+ createSingleServer,
killallServers,
- reRunServer,
- ServerInfo,
+ PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
-import { VideoPrivacy } from '@shared/models'
+} from '@shared/server-commands'
describe('Test redundancy constraints', function () {
- let remoteServer: ServerInfo
- let localServer: ServerInfo
- let servers: ServerInfo[]
+ let remoteServer: PeerTubeServer
+ let localServer: PeerTubeServer
+ let servers: PeerTubeServer[]
const remoteServerConfig = {
redundancy: {
this.timeout(120000)
{
- remoteServer = await flushAndRunServer(1, remoteServerConfig)
+ remoteServer = await createSingleServer(1, remoteServerConfig)
}
{
}
}
}
- localServer = await flushAndRunServer(2, config)
+ localServer = await createSingleServer(2, config)
}
servers = [ remoteServer, localServer ]
await waitJobs(servers)
// Server 1 and server 2 follow each other
- await remoteServer.follows.follow({ targets: [ localServer.url ] })
+ await remoteServer.follows.follow({ hosts: [ localServer.url ] })
await waitJobs(servers)
await remoteServer.redundancy.updateRedundancy({ host: localServer.host, redundancyAllowed: true })
}
}
}
- await await killallServers([ localServer ])
- await reRunServer(localServer, config)
+ await killallServers([ localServer ])
+ await localServer.run(config)
await uploadWrapper('video 2 server 2')
}
}
await killallServers([ localServer ])
- await reRunServer(localServer, config)
+ await localServer.run(config)
await uploadWrapper('video 3 server 2')
it('Should have redundancy on server 1 and on server 2 with followings filter now server 2 follows server 1', async function () {
this.timeout(120000)
- await localServer.follows.follow({ targets: [ remoteServer.url ] })
+ await localServer.follows.follow({ hosts: [ remoteServer.url ] })
await waitJobs(servers)
await uploadWrapper('video 4 server 2')