From b21f8ad6ca50762592da8c2d560535e79d6dfaa7 Mon Sep 17 00:00:00 2001 From: Nandhini Devi Kaliaperumal Date: Fri, 7 Dec 2018 00:30:30 +0530 Subject: [PATCH] Review comment addressed to correct the @tag decorators Change-Id: I4d50564123bc2218c29db1ed88a94b50ecf9b387 --- .../compute/volume_attachments_api/smoke.py | 1 + .../compute/volume_snapshot_integration_tests.py | 1 + .../blockstorage/volumes_api/snapshots/smoke.py | 10 +++++----- .../blockstorage/volumes_api/volumes/smoke.py | 14 +++++++------- .../volumes_api/volumes/volume_capacity_tests.py | 2 +- .../volumes_api/volumes/volume_cloning_tests.py | 4 ++-- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/cloudroast/blockstorage/volumes_api/integration/compute/volume_attachments_api/smoke.py b/cloudroast/blockstorage/volumes_api/integration/compute/volume_attachments_api/smoke.py index 81de72e1..5aad4b39 100644 --- a/cloudroast/blockstorage/volumes_api/integration/compute/volume_attachments_api/smoke.py +++ b/cloudroast/blockstorage/volumes_api/integration/compute/volume_attachments_api/smoke.py @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. """ from qe_coverage.opencafe_decorators import tags, unless_coverage + from cafe.drivers.unittest.suite import OpenCafeUnittestTestSuite from cloudroast.blockstorage.volumes_api.integration.compute.fixtures \ import ComputeIntegrationTestFixture diff --git a/cloudroast/blockstorage/volumes_api/integration/compute/volume_snapshot_integration_tests.py b/cloudroast/blockstorage/volumes_api/integration/compute/volume_snapshot_integration_tests.py index bb80a2f2..3604f361 100644 --- a/cloudroast/blockstorage/volumes_api/integration/compute/volume_snapshot_integration_tests.py +++ b/cloudroast/blockstorage/volumes_api/integration/compute/volume_snapshot_integration_tests.py @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. """ import time + from qe_coverage.opencafe_decorators import tags, unless_coverage from cloudroast.blockstorage.volumes_api.integration.compute.fixtures \ diff --git a/cloudroast/blockstorage/volumes_api/snapshots/smoke.py b/cloudroast/blockstorage/volumes_api/snapshots/smoke.py index c8056494..d98764a5 100644 --- a/cloudroast/blockstorage/volumes_api/snapshots/smoke.py +++ b/cloudroast/blockstorage/volumes_api/snapshots/smoke.py @@ -32,8 +32,8 @@ complete_volume_types.merge_dataset_tags(default_volume_type) @DataDrivenFixture class SnapshotActions(VolumesTestFixture): - @data_driven_test(complete_volume_types) @tags('smoke', 'positive') + @data_driven_test(complete_volume_types) def ddtest_verify_snapshot_status_progression( self, volume_type_name, volume_type_id): """Verify snapshot passes through all expected states after create""" @@ -54,8 +54,8 @@ class SnapshotActions(VolumesTestFixture): [statuses.Snapshot.AVAILABLE, statuses.Snapshot.CREATING]) self.assertEquals(snapshot.size, volume.size) - @data_driven_test(complete_volume_types) @tags('smoke', 'positive') + @data_driven_test(complete_volume_types) def ddtest_verify_snapshot_restore_to_same_volume_type( self, volume_type_name, volume_type_id): """Verify that a snapshot can be restored to a volume of the @@ -88,8 +88,8 @@ class SnapshotActions(VolumesTestFixture): original_volume, restored_volume, attr_list=comparable_attributes_list) - @data_driven_test(complete_volume_types) @tags('smoke', 'positive') + @data_driven_test(complete_volume_types) def ddtest_list_snapshots( self, volume_type_name, volume_type_id): """Verify that the api can list snapshots""" @@ -107,8 +107,8 @@ class SnapshotActions(VolumesTestFixture): self.assertIn(snapshot.name, [s.name for s in snapshot_list]) self.assertIn(snapshot.id_, [s.id_ for s in snapshot_list]) - @data_driven_test(complete_volume_types) @tags('smoke', 'positive') + @data_driven_test(complete_volume_types) def ddtest_list_detailed_snapshots( self, volume_type_name, volume_type_id): """Verify that the api can list snapshot details""" @@ -126,8 +126,8 @@ class SnapshotActions(VolumesTestFixture): self.assertIn(snapshot.name, [s.name for s in snapshot_list]) self.assertIn(snapshot.id_, [s.id_ for s in snapshot_list]) - @data_driven_test(complete_volume_types) @tags('smoke', 'positive') + @data_driven_test(complete_volume_types) def ddtest_get_snapshot_info( self, volume_type_name, volume_type_id): """Verify that the api return details on a single snapshot""" diff --git a/cloudroast/blockstorage/volumes_api/volumes/smoke.py b/cloudroast/blockstorage/volumes_api/volumes/smoke.py index 9f831753..5b7bb8a2 100644 --- a/cloudroast/blockstorage/volumes_api/volumes/smoke.py +++ b/cloudroast/blockstorage/volumes_api/volumes/smoke.py @@ -28,8 +28,8 @@ volume_types_dataset = BlockstorageDatasets.volume_types() @DataDrivenFixture class VolumeActions(VolumesTestFixture): - @data_driven_test(volume_types_dataset) @tags('volumes', 'smoke', 'positive') + @data_driven_test(volume_types_dataset) def ddtest_create_volume( self, volume_type_name, volume_type_id): """Verify that a volume of minimum size can be created""" @@ -77,8 +77,8 @@ class VolumeActions(VolumesTestFixture): # Verify volume create suceeded self.assertVolumeCreateSucceeded(volume.id_, volume.size) - @data_driven_test(volume_types_dataset) @tags('volumes', 'smoke', 'positive') + @data_driven_test(volume_types_dataset) def ddtest_final_volume_metadata( self, volume_type_name, volume_type_id): """Verify that a volume of minimum size can be created""" @@ -112,8 +112,8 @@ class VolumeActions(VolumesTestFixture): # Verify volume create suceeded self.assertVolumeCreateSucceeded(volume.id_, volume.size) - @data_driven_test(volume_types_dataset) @tags('volumes', 'smoke', 'positive') + @data_driven_test(volume_types_dataset) def ddtest_update_volume_info_via_body( self, volume_type_name, volume_type_id): """Verify that a volume's name and description can be updated after @@ -162,8 +162,8 @@ class VolumeActions(VolumesTestFixture): msg="Unmodified updated volume info did not match original volume " "info") - @data_driven_test(volume_types_dataset) @tags('volumes', 'smoke', 'positive') + @data_driven_test(volume_types_dataset) def ddtest_get_volume_info(self, volume_type_name, volume_type_id): """Verify that the API can return detailed information on a single volume @@ -180,8 +180,8 @@ class VolumeActions(VolumesTestFixture): # Test self.assertVolumeAttributesAreEqual(volume, volume_info) - @data_driven_test(volume_types_dataset) @tags('volumes', 'smoke', 'positive') + @data_driven_test(volume_types_dataset) def ddtest_list_volumes(self, volume_type_name, volume_type_id): """Verify that the API can return a list of all volumes""" @@ -201,8 +201,8 @@ class VolumeActions(VolumesTestFixture): 'No volumes where found in the volume list with an id == ' '{0}'.format(volume.id_)) - @data_driven_test(volume_types_dataset) @tags('volumes', 'smoke', 'positive') + @data_driven_test(volume_types_dataset) def ddtest_list_volume_details(self, volume_type_name, volume_type_id): """Verify that the API can return a list detailed information for all volumes @@ -227,8 +227,8 @@ class VolumeActions(VolumesTestFixture): self.assertVolumeAttributesAreEqual( volume, volume_info, excluded_attrs_list=['volume_image_metadata']) - @data_driven_test(volume_types_dataset) @tags('volumes', 'smoke', 'positive') + @data_driven_test(volume_types_dataset) def ddtest_delete_volume(self, volume_type_name, volume_type_id): """Verify that a volume can be deleted""" diff --git a/cloudroast/blockstorage/volumes_api/volumes/volume_capacity_tests.py b/cloudroast/blockstorage/volumes_api/volumes/volume_capacity_tests.py index 1fe2530b..62b21f82 100644 --- a/cloudroast/blockstorage/volumes_api/volumes/volume_capacity_tests.py +++ b/cloudroast/blockstorage/volumes_api/volumes/volume_capacity_tests.py @@ -30,8 +30,8 @@ volume_types_dataset = BlockstorageDatasets.volume_types() @DataDrivenFixture class VolumeCapacity(VolumesTestFixture): - @data_driven_test(volume_types_dataset) @tags('smoke', 'positive') + @data_driven_test(volume_types_dataset) def ddtest_create_maximum_size_volume( self, volume_type_name, volume_type_id): """Verify that a volume of maximum size can be created""" diff --git a/cloudroast/blockstorage/volumes_api/volumes/volume_cloning_tests.py b/cloudroast/blockstorage/volumes_api/volumes/volume_cloning_tests.py index 1a769eb0..5c4309d1 100644 --- a/cloudroast/blockstorage/volumes_api/volumes/volume_cloning_tests.py +++ b/cloudroast/blockstorage/volumes_api/volumes/volume_cloning_tests.py @@ -20,8 +20,8 @@ volume_types_dataset.merge_dataset_tags(random_vtype_dataset) @DataDrivenFixture class CBSVolumeCloneTests(VolumesTestFixture): - @data_driven_test(volume_types_dataset) @tags('smoke', 'positive') + @data_driven_test(volume_types_dataset) def ddtest_create_exact_clone_of_existing_volume_and_verify_attributes( self, volume_type_name, volume_type_id): """Verify that data written to a volume is intact and available @@ -80,8 +80,8 @@ class CBSVolumeCloneTests(VolumesTestFixture): # self.assertVolumeMetadataIsEqual( # volume, volume_clone_info, key_list=key_list) - @data_driven_test(volume_types_dataset) @tags('smoke', 'positive') + @data_driven_test(volume_types_dataset) def ddtest_create_larger_clone_of_volume( self, volume_type_name, volume_type_id): """Clone a volume using a larger size than the original volume."""