From: Jenkins Date: Fri, 23 Aug 2013 04:26:57 +0000 (+0000) Subject: Merge "Limit maximum size of all templates" X-Git-Tag: 2014.1~172 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=161d1340dfa4d6d0b78b1ec3e55689191412dbd0;p=openstack-build%2Fheat-build.git Merge "Limit maximum size of all templates" --- 161d1340dfa4d6d0b78b1ec3e55689191412dbd0 diff --cc heat/tests/test_template_format.py index 8bde30d6,da98752f..6128a9b0 --- a/heat/tests/test_template_format.py +++ b/heat/tests/test_template_format.py @@@ -89,7 -92,34 +92,16 @@@ Outputs: { tpl2 = template_format.parse(yaml2) self.assertEqual(tpl1, tpl2) + def test_long_yaml(self): + template = {'HeatTemplateVersion': '2012-12-12'} + template['Resources'] = ['a'] * (config.cfg.CONF.max_template_size / 3) + limit = config.cfg.CONF.max_template_size + long_yaml = yaml.safe_dump(template) + self.assertTrue(len(long_yaml) > limit) + self.assertRaises(exception.TemplateTooBig, template_format.parse, + long_yaml) + -class YamlEnvironmentTest(HeatTestCase): - - def test_no_template_sections(self): - env = ''' -parameters: {} -resource_registry: {} -''' - parsed_env = template_format.parse(env, add_template_sections=False) - - self.assertEqual('parameters' in parsed_env, True) - self.assertEqual('resource_registry' in parsed_env, True) - - self.assertEqual('Parameters' in parsed_env, False) - self.assertEqual('Mappings' in parsed_env, False) - self.assertEqual('Resources' in parsed_env, False) - self.assertEqual('Outputs' in parsed_env, False) - - class JsonYamlResolvedCompareTest(HeatTestCase): def setUp(self):