openstack
/
heat
Code Issues Proposed changes

Merge "Remove tests for show attribute in cinder"

This commit is contained in:
Jenkins 2016-08-02 10:58:05 +00:00 committed by Gerrit Code Review
parent d9218ba0ae 4bd0f634ec
commit 0a5b8ac850
4 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
heat/tests/openstack/cinder/test_volume.py
View File

@ -273,7 +273,6 @@ class CinderVolumeTest(vt_base.BaseVolumeTest):
self.assertEqual(u'False', rsrc.FnGetAtt('bootable'))
self.assertEqual(u'False', rsrc.FnGetAtt('encrypted'))
self.assertEqual(u'[]', rsrc.FnGetAtt('attachments'))
self.assertEqual({'volume': 'info'}, rsrc.FnGetAtt('show'))
self.assertEqual('False', rsrc.FnGetAtt('multiattach'))
error = self.assertRaises(exception.InvalidTemplateAttribute,
rsrc.FnGetAtt, 'unknown')

9
heat/tests/openstack/cinder/test_volume_type.py
View File

@ -211,12 +211,3 @@ class CinderVolumeTypeTest(common.HeatTestCase):
self.cinderclient.volume_api_version = 2
self.stub_KeystoneProjectConstraint()
self.assertIsNone(self.my_volume_type.validate())
def test_volume_type_show_resource(self):
volume_type_id = '927202df-1afb-497f-8368-9c2d2f26e5db'
self.my_volume_type.resource_id = volume_type_id
volume_type = mock.Mock()
volume_type.to_dict = lambda: {'vtype': 'info'}
self.volume_types.get.return_value = volume_type
self.assertEqual({'vtype': 'info'},
self.my_volume_type.FnGetAtt('show'))

9
heat/tests/openstack/cinder/test_volume_type_encryption.py
View File

@ -95,12 +95,3 @@ class CinderEncryptedVolumeTypeTest(common.HeatTestCase):
self.volume_encryption_types.update.assert_called_once_with(
volume_type=volume_type_id, specs=update_args)
def test_volume_type_show_resource(self):
volume_type_id = '01bd581d-33fe-4d6d-bd7b-70ae076d39fb'
self.my_encrypted_vol_type.resource_id = volume_type_id
volume_type = mock.Mock()
volume_type.to_dict = lambda: {'vtype': 'info'}
self.volume_encryption_types.get.return_value = volume_type
self.assertEqual({'vtype': 'info'},
self.my_encrypted_vol_type.FnGetAtt('show'))

1
heat/tests/openstack/cinder/test_volume_utils.py
View File

@ -99,7 +99,6 @@ class FakeVolume(object):
def __init__(self, status, **attrs):
self.status = status
self.to_dict = lambda: {'volume': 'info'}
for key, value in six.iteritems(attrs):
setattr(self, key, value)
if 'id' not in attrs: