summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-09-30 07:36:35 +0000
committerGerrit Code Review <review@openstack.org>2012-09-30 07:36:35 +0000
commit7284dca72a5adb29b3e3e67ffec1c0821f12d7fb (patch)
treed5c7e8780a83019da6395b16481180a373528177 /nova/tests
parent2377d6a7b6b275febdf57b345c72a402254eb925 (diff)
parent3db7a943bebbda5fea07fc80813cabc436fb892b (diff)
Merge "Fixes error message for flavor-create duplicate ID"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_instance_types.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index d9d2669a3..5059b155a 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -159,7 +159,7 @@ class InstanceTypeTestCase(test.TestCase):
"""Ensures that flavorid duplicates raise InstanceTypeCreateFailed"""
flavorid = 'flavor1'
instance_types.create('name one', 256, 1, 120, 200, flavorid)
- self.assertRaises(exception.InstanceTypeExists,
+ self.assertRaises(exception.InstanceTypeIdExists,
instance_types.create,
'name two', 256, 1, 120, 200, flavorid)