commit bddf45beb566c359b09bbe3ca61a50ff8fed3435
author Jenkins <jenkins@review.openstack.org> Fri Jan 27 01:04:02 2017 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jan 27 01:04:02 2017 +0000
tree ca00052a6c2cbb53a6e4a4b7507259555edacef8
parent f1fb368732d4a84e51971b17811f6aa0c6e663d9
parent 8d9d8d72b0ce45d20e46b73caa4dca94e22811e7

Merge "Don't skip Cinder backup tests based on Swift's availability"

tempest/api/volume/admin/test_volumes_backup.py

diff --git a/tempest/api/volume/admin/test_volumes_backup.py b/tempest/api/volume/admin/test_volumes_backup.py
index 7591612..61d4ba7 100644
--- a/tempest/api/volume/admin/test_volumes_backup.py
+++ b/tempest/api/volume/admin/test_volumes_backup.py
@@ -32,9 +32,6 @@
         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)

tempest/api/volume/test_volumes_backup.py

diff --git a/tempest/api/volume/test_volumes_backup.py b/tempest/api/volume/test_volumes_backup.py
index 03a3774..6dcde08 100644
--- a/tempest/api/volume/test_volumes_backup.py
+++ b/tempest/api/volume/test_volumes_backup.py
@@ -29,9 +29,6 @@
         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