openstack/tempest
Code Issues Proposed changes

Merge "Volume: remove a useless _delete_volume_type alias"

Browse Source
This commit is contained in:
Jenkins 2016-04-30 19:12:52 +00:00 committed by Gerrit Code Review
commit bc9e9ed470
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tempest/api/volume/admin/test_volume_types.py
View File

@ -28,9 +28,6 @@ class VolumeTypesV2Test(base.BaseVolumeAdminTest):
self.volumes_client.delete_volume(volume_id)
self.volumes_client.wait_for_resource_deletion(volume_id)
def _delete_volume_type(self, volume_type_id):
self.volume_types_client.delete_volume_type(volume_type_id)
@test.idempotent_id('9d9b28e3-1b2e-4483-a2cc-24aa0ea1de54')
def test_volume_type_list(self):
# List volume types.
@ -54,7 +51,8 @@ class VolumeTypesV2Test(base.BaseVolumeAdminTest):
name=vol_type_name,
extra_specs=extra_specs)['volume_type']
volume_types.append(vol_type)
self.addCleanup(self._delete_volume_type, vol_type['id'])
self.addCleanup(self.volume_types_client.delete_volume_type,
vol_type['id'])
params = {self.name_field: vol_name,
'volume_type': volume_types[0]['id']}
@ -103,7 +101,8 @@ class VolumeTypesV2Test(base.BaseVolumeAdminTest):
name=name,
extra_specs=extra_specs)['volume_type']
self.assertIn('id', body)
self.addCleanup(self._delete_volume_type, body['id'])
self.addCleanup(self.volume_types_client.delete_volume_type,
body['id'])
self.assertIn('name', body)
self.assertEqual(body['name'], name,
"The created volume_type name is not equal "
@ -130,7 +129,8 @@ class VolumeTypesV2Test(base.BaseVolumeAdminTest):
name = data_utils.rand_name("volume-type")
body = self.volume_types_client.create_volume_type(
name=name)['volume_type']
self.addCleanup(self._delete_volume_type, body['id'])
self.addCleanup(self.volume_types_client.delete_volume_type,
body['id'])
# Create encryption type
encryption_type = self.volume_types_client.create_encryption_type(