requested changes

This commit is contained in:
heafalan
2019-08-08 10:21:25 +02:00
parent fd7eddb68c
commit fac2e6845c
2 changed files with 19 additions and 9 deletions

View File

@@ -11,7 +11,7 @@
[vms]
default = ''
vmToBackup = ''
# vmToBackup = ''
[templates]
default = ''
@@ -22,5 +22,5 @@
[remotes]
default = { name = '', url = '' }
# For delta backup, we need two remotes
remote1 = { name = '', url = '' }
remote2 = { name = '', url = '' }
# remote1 = { name = '', url = '' }
# remote2 = { name = '', url = '' }

View File

@@ -447,11 +447,21 @@ describe('backupNg', () => {
test('execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval', async () => {
jest.setTimeout(6e4)
const vmId = config.vms.vmToBackup
if (xo.objects.all[vmId] === undefined) throw new Error('no vm to backup')
const {
vms: { default: defaultVm, vmToBackup = defaultVm },
remotes: {
default: defaultRemote,
remote1 = defaultRemote,
remote2 = defaultRemote,
},
servers: { default: defaultServer },
} = config
await xo.createTempServer(config.servers.default)
const { remote1, remote2 } = config.remotes
expect(vmToBackup).not.toBe(undefined)
expect(remote1).not.toBe(undefined)
expect(remote2).not.toBe(undefined)
await xo.createTempServer(defaultServer)
const { id: remoteId1 } = await xo.createTempRemote(remote1)
const { id: remoteId2 } = await xo.createTempRemote(remote2)
const remotes = [remoteId1, remoteId2]
@@ -478,7 +488,7 @@ describe('backupNg', () => {
[scheduleTempId]: { exportRetention },
},
vms: {
id: vmId,
id: vmToBackup,
},
})
@@ -519,7 +529,7 @@ describe('backupNg', () => {
}
tasks.forEach(({ tasks, ...vmTask }) => {
if (vmTask.data !== undefined && vmTask.data.type === 'VM') {
validateVmTask(vmTask, vmId, { status: 'success' })
validateVmTask(vmTask, vmToBackup, { status: 'success' })
numberOfTasks.vm++
tasks.forEach(({ tasks, ...subTask }) => {
if (subTask.message === 'snapshot') {