mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-08 14:21:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #500 from nrb/fix-497

Browse Source 
Exit when failing to update a backup's phase
This commit is contained in:
Andy Goldstein
2018-05-17 14:23:41 -04:00
committed by GitHub
parent 3a746a3f73 7eac6675e8
commit 2fde1f5fc1
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/backup_deletion_controller.go
View File

@@ -211,6 +211,7 @@ func (c *backupDeletionController) processRequest(req *v1.DeleteBackupRequest) e
})
if err != nil {
log.WithError(errors.WithStack(err)).Error("Error setting backup phase to deleting")
return err
}
var errs []string

16
pkg/controller/backup_deletion_controller_test.go
View File

@@ -263,6 +263,22 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
assert.EqualError(t, err, "error patching DeleteBackupRequest: bad")
})
t.Run("patching backup to Deleting fails", func(t *testing.T) {
backup := arktest.NewTestBackup().WithName("foo").WithSnapshot("pv-1", "snap-1").Backup
td := setupBackupDeletionControllerTest(backup)
defer td.backupService.AssertExpectations(t)
td.client.PrependReactor("patch", "deletebackuprequests", func(action core.Action) (bool, runtime.Object, error) {
return true, td.req, nil
})
td.client.PrependReactor("patch", "backups", func(action core.Action) (bool, runtime.Object, error) {
return true, nil, errors.New("bad")
})
err := td.controller.processRequest(td.req)
assert.EqualError(t, err, "error patching Backup: bad")
})
t.Run("unable to find backup", func(t *testing.T) {
td := setupBackupDeletionControllerTest()
defer td.backupService.AssertExpectations(t)