openstack/heat
Code Issues Proposed changes

Merge "Access Template class through template module"

Browse Source
This commit is contained in:
Jenkins authored and Gerrit Code Review committed 2014-10-02 09:38:58 +00:00
2 parents 305cd04ce8 dad298697b
commit ecf3d81a8a
1 file changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files
heat/tests/test_engine_service.py
+5 -5
View File
@@ -2987,7 +2987,7 @@ class StackServiceTest(HeatTestCase):
@mock.patch.object(service.db_api, 'stack_get_by_name')
def test_validate_new_stack_checks_existing_stack(self, mock_stack_get):
mock_stack_get.return_value = 'existing_db_stack'
tmpl = service.templatem.Template(
tmpl = templatem.Template(
{'HeatTemplateFormatVersion': '2012-12-12'})
self.assertRaises(exception.StackExists, self.eng._validate_new_stack,
self.ctx, 'test_existing_stack', tmpl)
@@ -2996,7 +2996,7 @@ class StackServiceTest(HeatTestCase):
def test_validate_new_stack_checks_stack_limit(self, mock_db_count):
cfg.CONF.set_override('max_stacks_per_tenant', 99)
mock_db_count.return_value = 99
template = service.templatem.Template(
template = templatem.Template(
{'HeatTemplateFormatVersion': '2012-12-12'})
self.assertRaises(exception.RequestLimitExceeded,
self.eng._validate_new_stack,
@@ -3006,7 +3006,7 @@ class StackServiceTest(HeatTestCase):
template = {'heat_template_version': '2013-05-23',
'resources': {
'Res': {'Type': 'GenericResource1'}}}
parsed_template = service.templatem.Template(template)
parsed_template = templatem.Template(template)
ex = self.assertRaises(exception.StackValidationFailed,
self.eng._validate_new_stack,
self.ctx, 'test_existing_stack',
@@ -3019,7 +3019,7 @@ class StackServiceTest(HeatTestCase):
template = {'heat_template_version': '2013-05-23',
'unknown_section': {
'Res': {'Type': 'GenericResource1'}}}
parsed_template = service.templatem.Template(template)
parsed_template = templatem.Template(template)
ex = self.assertRaises(exception.StackValidationFailed,
self.eng._validate_new_stack,
self.ctx, 'test_existing_stack',
@@ -3037,7 +3037,7 @@ class StackServiceTest(HeatTestCase):
'Res4': {'Type': 'GenericResource1'},
'Res5': {'Type': 'GenericResource1'},
'Res6': {'Type': 'GenericResource1'}}}
parsed_template = service.templatem.Template(template)
parsed_template = templatem.Template(template)
self.assertRaises(exception.RequestLimitExceeded,
self.eng._validate_new_stack,
self.ctx, 'test_existing_stack', parsed_template)