diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-29 20:36:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-29 20:36:34 +0000 |
| commit | 843c05be0ff07859d18decea8e442ed1e7a96c81 (patch) | |
| tree | cde510f27e7eb675cfb35eef4f2071723a1688dd | |
| parent | 1ab14e0edaf3f37689a827010bd3f64a54cdc76e (diff) | |
| parent | dac81bd2592015f6bf33b403b1bc12a99ce57080 (diff) | |
| download | heat-843c05be0ff07859d18decea8e442ed1e7a96c81.tar.gz | |
Merge "Fix couple tests in test_engine_service.py"
| -rw-r--r-- | heat/tests/test_engine_service.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index cdf2c46bc..6b605b8ca 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -2914,8 +2914,10 @@ 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( + {'HeatTemplateFormatVersion': '2012-12-12'}) self.assertRaises(exception.StackExists, self.eng._validate_new_stack, - self.ctx, 'test_existing_stack', 'parsed_template') + self.ctx, 'test_existing_stack', tmpl) @mock.patch.object(service.db_api, 'stack_count_all') def test_validate_new_stack_checks_stack_limit(self, mock_db_count): @@ -2930,7 +2932,13 @@ class StackServiceTest(HeatTestCase): def test_validate_new_stack_checks_resource_limit(self): cfg.CONF.set_override('max_resources_per_stack', 5) template = {'HeatTemplateFormatVersion': '2012-12-12', - 'Resources': [1, 2, 3, 4, 5, 6]} + 'Resources': { + 'Res1': {'Type': 'GenericResource1'}, + 'Res2': {'Type': 'GenericResource1'}, + 'Res3': {'Type': 'GenericResource1'}, + 'Res4': {'Type': 'GenericResource1'}, + 'Res5': {'Type': 'GenericResource1'}, + 'Res6': {'Type': 'GenericResource1'}}} parsed_template = service.templatem.Template(template) self.assertRaises(exception.RequestLimitExceeded, self.eng._validate_new_stack, |