Merge "Backport V3 flavor extraspecs API unit tests to V2"

This commit is contained in:
Jenkins
2014-08-26 04:52:38 +00:00
committed by Gerrit Code Review
2 changed files with 10 additions and 0 deletions

View File

@@ -64,6 +64,10 @@ class FlavorExtraSpecsController(object):
try:
flavors.validate_extra_spec_keys(specs.keys())
except TypeError:
msg = _("Fail to validate provided extra specs keys. "
"Expected string")
raise exc.HTTPBadRequest(explanation=msg)
except exception.InvalidInput as error:
raise exc.HTTPBadRequest(explanation=error.format_message())

View File

@@ -213,6 +213,9 @@ class FlavorsExtraSpecsTest(test.TestCase):
def test_create_non_dict_extra_specs(self):
self._test_create_bad_request({"extra_specs": "non_dict"})
def test_create_non_string_key(self):
self._test_create_bad_request({"extra_specs": {None: "value1"}})
def test_create_non_string_value(self):
self._test_create_bad_request({"extra_specs": {"key1": None}})
@@ -298,6 +301,9 @@ class FlavorsExtraSpecsTest(test.TestCase):
def test_update_item_non_dict_extra_specs(self):
self._test_update_item_bad_request("non_dict")
def test_update_item_non_string_key(self):
self._test_update_item_bad_request({None: "value1"})
def test_update_item_non_string_value(self):
self._test_update_item_bad_request({"key1": None})