openstack
/
heat
Code Issues Proposed changes

Merge "Example for "Replace" function should use self.fn_name"

This commit is contained in:
Jenkins 2016-09-24 17:15:36 +00:00 committed by Gerrit Code Review
parent d2a32a06eb d5cd3985de
commit 6722cc00e9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/engine/hot/functions.py
View File

@ -373,13 +373,13 @@ class Replace(function.Function):
mapping = self.args['params']
string = self.args['template']
except (KeyError, TypeError):
example = ('''str_replace:
example = _('''%s:
template: This is var1 template var2
params:
var1: a
var2: string''')
raise KeyError(_('"str_replace" syntax should be %s') %
example)
var2: string''') % self.fn_name
raise KeyError(_('"%(fn_name)s" syntax should be %(example)s') %
{'fn_name': self.fn_name, 'example': example})
else:
return mapping, string

6
heat/tests/test_hot.py
View File

@ -700,8 +700,10 @@ class HOTemplateTest(common.HeatTestCase):
snippet = {'str_replace': {'tmpl': 'Template var1 string var2',
'parms': {'var1': 'foo', 'var2': 'bar'}}}
self.assertRaises(exception.StackValidationFailed,
self.resolve, snippet, tmpl)
ex = self.assertRaises(exception.StackValidationFailed,
self.resolve, snippet, tmpl)
self.assertIn('"str_replace" syntax should be str_replace:\\n',
six.text_type(ex))
def test_str_replace_invalid_param_types(self):
"""Test str_replace function parameter values.