summaryrefslogtreecommitdiff
path: root/heat/tests
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-10-13 14:53:47 +0000
committerGerrit Code Review <review@openstack.org>2020-10-13 14:53:47 +0000
commitff66d36dd5c351b8874e4776f6d8115c6bee96b7 (patch)
tree6f51cf9d355dc884b9515b7ec19d011aa05ab3c9 /heat/tests
parent925216339eac31746feafa97b81490365921d7f1 (diff)
parent4aafceb3798df94abf236f7f3abb5dcf6c425bb3 (diff)
downloadheat-ff66d36dd5c351b8874e4776f6d8115c6bee96b7.tar.gz
Merge "Lazily cache parsed value of list/json parameters" into stable/ussuri
Diffstat (limited to 'heat/tests')
-rw-r--r--heat/tests/test_parameters.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/heat/tests/test_parameters.py b/heat/tests/test_parameters.py
index f438c37fb..9ced8e25e 100644
--- a/heat/tests/test_parameters.py
+++ b/heat/tests/test_parameters.py
@@ -380,7 +380,7 @@ class ParameterTestSpecific(common.HeatTestCase):
schema = {'Type': 'Json',
'ConstraintDescription': 'wibble'}
val = {"foo": "bar", "not_json": len}
- err = self.assertRaises(ValueError,
+ err = self.assertRaises(exception.StackValidationFailed,
new_parameter, 'p', schema, val)
self.assertIn('Value must be valid JSON', six.text_type(err))
@@ -398,7 +398,7 @@ class ParameterTestSpecific(common.HeatTestCase):
schema = {'Type': 'Json',
'ConstraintDescription': 'wibble'}
val = "I am not a map"
- err = self.assertRaises(ValueError,
+ err = self.assertRaises(exception.StackValidationFailed,
new_parameter, 'p', schema, val)
self.assertIn('Value must be valid JSON', six.text_type(err))