openstack/deb-heat
Code Issues Proposed changes

Avoid name clash between local variable and a module

Browse Source 
stack_resource is an imported module and it's been used as
a local variable.

Change-Id: I0988f248f9a80cb893b8a5acded1a8168f5679ac
This commit is contained in:
Angus Salkeld 2014-08-21 12:34:04 +10:00
parent 848bc37e2a
commit 4872f44944
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
heat/tests/test_stack_resource.py
View File

@ -212,36 +212,36 @@ class StackResourceTest(HeatTestCase):
def test_preview_validates_nested_resources(self):
parent_t = self.parent_stack.t
resource_defns = parent_t.resource_definitions(self.parent_stack)
stack_resource = MyImplementedStackResource(
stk_resource = MyImplementedStackResource(
'test',
resource_defns[self.ws_resname],
self.parent_stack)
stack_resource.child_template = \
stk_resource.child_template = \
mock.Mock(return_value=parser.Template(self.simple_template))
stack_resource.child_params = mock.Mock()
stk_resource.child_params = mock.Mock()
exc = exception.RequestLimitExceeded(message='Validation Failed')
validation_mock = mock.Mock(side_effect=exc)
stack_resource._validate_nested_resources = validation_mock
stk_resource._validate_nested_resources = validation_mock
self.assertRaises(exception.RequestLimitExceeded,
stack_resource.preview)
stk_resource.preview)
def test_preview_dict_validates_nested_resources(self):
parent_t = self.parent_stack.t
resource_defns = parent_t.resource_definitions(self.parent_stack)
stack_resource = MyImplementedStackResource(
stk_resource = MyImplementedStackResource(
'test',
resource_defns[self.ws_resname],
self.parent_stack)
stack_resource.child_template = \
stk_resource.child_template = \
mock.Mock(return_value=self.simple_template)
stack_resource.child_params = mock.Mock()
stk_resource.child_params = mock.Mock()
exc = exception.RequestLimitExceeded(message='Validation Failed')
validation_mock = mock.Mock(side_effect=exc)
stack_resource._validate_nested_resources = validation_mock
stk_resource._validate_nested_resources = validation_mock
self.assertRaises(exception.RequestLimitExceeded,
stack_resource.preview)
stk_resource.preview)
def test__validate_nested_resources_checks_num_of_resources(self):
stack_resource.cfg.CONF.set_override('max_resources_per_stack', 2)