summaryrefslogtreecommitdiff
path: root/cinder/tests/unit/api/contrib/test_backups.py
diff options
context:
space:
mode:
Diffstat (limited to 'cinder/tests/unit/api/contrib/test_backups.py')
-rw-r--r--cinder/tests/unit/api/contrib/test_backups.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/cinder/tests/unit/api/contrib/test_backups.py b/cinder/tests/unit/api/contrib/test_backups.py
index 9c6bb4955..028d94af5 100644
--- a/cinder/tests/unit/api/contrib/test_backups.py
+++ b/cinder/tests/unit/api/contrib/test_backups.py
@@ -2240,9 +2240,14 @@ class BackupsAPITestCase(test.TestCase):
res_dict['badRequest']['code'])
self.assertEqual('Invalid backup: Backup already exists in database.',
res_dict['badRequest']['message'])
- mock_reserve.assert_called_with(
- ctx, backups=1, backup_gigabytes=1)
- mock_rollback.assert_called_with(ctx, "fake_reservation")
+
+ # Bug #1965847: already existing backup should not be deleted
+ self.assertNotEqual(fields.BackupStatus.DELETED,
+ self._get_backup_attrib(backup.id, 'status'))
+ mock_reserve.assert_not_called()
+ mock_rollback.assert_not_called()
+ mock_commit.assert_not_called()
+
backup.destroy()
@mock.patch.object(quota.QUOTAS, 'commit')