Merge "Don't skip Cinder backup tests based on Swift's availability"
This commit is contained in:
commit
bddf45beb5
@ -32,9 +32,6 @@ class VolumesBackupsAdminV2Test(base.BaseVolumeAdminTest):
|
||||
super(VolumesBackupsAdminV2Test, cls).skip_checks()
|
||||
if not CONF.volume_feature_enabled.backup:
|
||||
raise cls.skipException("Cinder backup feature disabled")
|
||||
if not CONF.service_available.swift:
|
||||
skip_msg = ("%s skipped as swift is not available" % cls.__name__)
|
||||
raise cls.skipException(skip_msg)
|
||||
|
||||
def _delete_backup(self, backup_id):
|
||||
self.admin_backups_client.delete_backup(backup_id)
|
||||
|
@ -29,9 +29,6 @@ class VolumesBackupsV2Test(base.BaseVolumeTest):
|
||||
super(VolumesBackupsV2Test, cls).skip_checks()
|
||||
if not CONF.volume_feature_enabled.backup:
|
||||
raise cls.skipException("Cinder backup feature disabled")
|
||||
if not CONF.service_available.swift:
|
||||
skip_msg = ("%s skipped as swift is not available" % cls.__name__)
|
||||
raise cls.skipException(skip_msg)
|
||||
|
||||
def restore_backup(self, backup_id):
|
||||
# Restore a backup
|
||||
|
Loading…
x
Reference in New Issue
Block a user