From a54417270b11e65550acc4700cf8edf142f6ee60 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Tue, 14 Sep 2021 08:13:13 +0000 Subject: [PATCH] Skip snaphost tests unless snapshot feature is enabled 2 tests perfoming a volume and server snapshot weren't skipped when the snapshot features were disabled: CONF.volume_feature_enabled.snapshot CONF.compute_feature_enabled.snapshot Closes-Bug: #1938529 Change-Id: If7621e5ad982f43777ad3354d48ac8235420d1c6 --- tempest/api/compute/volumes/test_attach_volume.py | 2 ++ tempest/api/volume/admin/test_volume_retype.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tempest/api/compute/volumes/test_attach_volume.py b/tempest/api/compute/volumes/test_attach_volume.py index 7251e36cab..4c7c234c78 100644 --- a/tempest/api/compute/volumes/test_attach_volume.py +++ b/tempest/api/compute/volumes/test_attach_volume.py @@ -455,6 +455,8 @@ class AttachVolumeMultiAttachTest(BaseAttachVolumeTest): @utils.services('image') @decorators.idempotent_id('885ac48a-2d7a-40c5-ae8b-1993882d724c') + @testtools.skipUnless(CONF.compute_feature_enabled.snapshot, + 'Snapshotting is not available.') def test_snapshot_volume_backed_multiattach(self): """Boots a server from a multiattach volume and snapshots the server. diff --git a/tempest/api/volume/admin/test_volume_retype.py b/tempest/api/volume/admin/test_volume_retype.py index 5c14d52f36..4a3f4940af 100644 --- a/tempest/api/volume/admin/test_volume_retype.py +++ b/tempest/api/volume/admin/test_volume_retype.py @@ -13,6 +13,7 @@ import abc from oslo_log import log as logging +import testtools from tempest.api.volume import base from tempest.common import waiters @@ -146,6 +147,8 @@ class VolumeRetypeWithMigrationTest(VolumeRetypeTest): self._retype_volume(src_vol, migration_policy='on-demand') @decorators.idempotent_id('d0d9554f-e7a5-4104-8973-f35b27ccb60d') + @testtools.skipUnless(CONF.volume_feature_enabled.snapshot, + "Cinder volume snapshots are disabled.") def test_volume_from_snapshot_retype_with_migration(self): """Test volume created from snapshot retype with migration