x/python-ganttclient
Code Issues Proposed changes

Merge "Removes constraints from instance and volume types"

Browse Source
This commit is contained in:
Jenkins
2012-02-10 22:10:54 +00:00
committed by Gerrit Code Review
parent dad176ffed f35c60c069
commit 590efb11e5
5 changed files with 39 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
nova/tests/test_instance_types.py
View File

@@ -84,21 +84,14 @@ class InstanceTypeTestCase(test.TestCase):
self.assertNotEqual(len(original_list), len(new_list),
'instance type was not created')
# destroy instance and make sure deleted flag is set to True
instance_types.destroy(name)
inst_type = instance_types.get_instance_type(inst_type_id)
self.assertEqual(1, inst_type["deleted"])
self.assertRaises(exception.ApiError,
instance_types.get_instance_type, inst_type_id)
# deleted instance should not be in list anymoer
new_list = instance_types.get_all_types()
self.assertEqual(original_list, new_list)
# ensure instances are gone after purge
instance_types.purge(name)
new_list = instance_types.get_all_types()
self.assertEqual(original_list, new_list,
'instance type not purged')
def test_get_all_instance_types(self):
"""Ensures that all instance types can be retrieved"""
session = get_session()
@@ -143,15 +136,15 @@ class InstanceTypeTestCase(test.TestCase):
"""Ensures that name duplicates raise ApiError"""
name = 'some_name'
instance_types.create(name, 256, 1, 120, 200, 'flavor1')
self.assertRaises(exception.ApiError,
self.assertRaises(exception.InstanceTypeExists,
instance_types.create,
name, "256", 1, 120, 200, 'flavor2')
name, 256, 1, 120, 200, 'flavor2')
def test_duplicate_flavorids_fail(self):
"""Ensures that flavorid duplicates raise ApiError"""
flavorid = 'flavor1'
instance_types.create('name one', 256, 1, 120, 200, flavorid)
self.assertRaises(exception.ApiError,
self.assertRaises(exception.InstanceTypeExists,
instance_types.create,
'name two', 256, 1, 120, 200, flavorid)
@@ -160,17 +153,6 @@ class InstanceTypeTestCase(test.TestCase):
self.assertRaises(exception.InstanceTypeNotFoundByName,
instance_types.destroy, None)
def test_will_not_purge_without_name(self):
"""Ensure purge without a name raises error"""
self.assertRaises(exception.InstanceTypeNotFoundByName,
instance_types.purge, None)
def test_will_not_purge_with_wrong_name(self):
"""Ensure purge without correct name raises error"""
self.assertRaises(exception.InstanceTypeNotFound,
instance_types.purge,
'unknown_flavor')
def test_will_not_get_bad_default_instance_type(self):
"""ensures error raised on bad default instance type"""
self.flags(default_instance_type='unknown_flavor')