openstack
/
heat
Code Issues Proposed changes

Merge "Remove mox from test_stack_resource"

This commit is contained in:
Zuul 2018-03-09 12:34:13 +00:00 committed by Gerrit Code Review
parent f0648502da 59482d651b
commit 135ce4bc5f
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
heat/tests/test_stack_resource.py
View File

@ -492,24 +492,19 @@ class StackResourceTest(StackResourceBaseTest):
def test_load_nested_ok(self): def test_load_nested_ok(self):
self.parent_resource._nested = None self.parent_resource._nested = None
self.parent_resource.resource_id = 319 self.parent_resource.resource_id = 319
self.m.StubOutWithMock(parser.Stack, 'load') mock_load = self.patchobject(parser.Stack, 'load', return_value='s')
parser.Stack.load(self.parent_resource.context,
self.parent_resource.resource_id).AndReturn('s')
self.m.ReplayAll()
self.parent_resource.nested() self.parent_resource.nested()
self.m.VerifyAll() mock_load.assert_called_once_with(self.parent_resource.context,
self.parent_resource.resource_id)
def test_load_nested_non_exist(self): def test_load_nested_non_exist(self):
self.parent_resource._nested = None self.parent_resource._nested = None
self.parent_resource.resource_id = '90-8' self.parent_resource.resource_id = '90-8'
self.m.StubOutWithMock(parser.Stack, 'load') mock_load = self.patchobject(parser.Stack, 'load',
parser.Stack.load(self.parent_resource.context, side_effect=[exception.NotFound])
self.parent_resource.resource_id).AndRaise(
exception.NotFound)
self.m.ReplayAll()
self.assertIsNone(self.parent_resource.nested()) self.assertIsNone(self.parent_resource.nested())
self.m.VerifyAll() mock_load.assert_called_once_with(self.parent_resource.context,
self.parent_resource.resource_id)
def test_load_nested_cached(self): def test_load_nested_cached(self):
self.parent_resource._nested = 'gotthis' self.parent_resource._nested = 'gotthis'
@ -743,34 +738,30 @@ class StackResourceAttrTest(StackResourceBaseTest):
def test_validate_nested_stack(self): def test_validate_nested_stack(self):
self.parent_resource.child_template = mock.Mock(return_value='foo') self.parent_resource.child_template = mock.Mock(return_value='foo')
self.parent_resource.child_params = mock.Mock(return_value={}) self.parent_resource.child_params = mock.Mock(return_value={})
nested = self.m.CreateMockAnything() nested = mock.Mock()
nested.validate().AndReturn(True) nested.validate.return_value = True
self.m.StubOutWithMock(stack_resource.StackResource, mock_parse_nested = self.patchobject(stack_resource.StackResource,
'_parse_nested_stack') '_parse_nested_stack',
return_value=nested)
name = '%s-%s' % (self.parent_stack.name, self.parent_resource.name) name = '%s-%s' % (self.parent_stack.name, self.parent_resource.name)
stack_resource.StackResource._parse_nested_stack(
name, 'foo', {}).AndReturn(nested)
self.m.ReplayAll()
self.parent_resource.validate_nested_stack() self.parent_resource.validate_nested_stack()
self.assertFalse(nested.strict_validate) self.assertFalse(nested.strict_validate)
self.m.VerifyAll() mock_parse_nested.assert_called_once_with(name, 'foo', {})
def test_validate_assertion_exception_rethrow(self): def test_validate_assertion_exception_rethrow(self):
expected_message = 'Expected Assertion Error' expected_message = 'Expected Assertion Error'
self.parent_resource.child_template = mock.Mock(return_value='foo') self.parent_resource.child_template = mock.Mock(return_value='foo')
self.parent_resource.child_params = mock.Mock(return_value={}) self.parent_resource.child_params = mock.Mock(return_value={})
self.m.StubOutWithMock(stack_resource.StackResource, mock_parse_nested = self.patchobject(
'_parse_nested_stack') stack_resource.StackResource,
'_parse_nested_stack',
side_effect=AssertionError(expected_message))
name = '%s-%s' % (self.parent_stack.name, self.parent_resource.name) name = '%s-%s' % (self.parent_stack.name, self.parent_resource.name)
stack_resource.StackResource._parse_nested_stack(
name, 'foo', {}).AndRaise(AssertionError(expected_message))
self.m.ReplayAll()
exc = self.assertRaises(AssertionError, exc = self.assertRaises(AssertionError,
self.parent_resource.validate_nested_stack) self.parent_resource.validate_nested_stack)
self.assertEqual(expected_message, six.text_type(exc)) self.assertEqual(expected_message, six.text_type(exc))
self.m.VerifyAll() mock_parse_nested.assert_called_once_with(name, 'foo', {})
class StackResourceCheckCompleteTest(StackResourceBaseTest): class StackResourceCheckCompleteTest(StackResourceBaseTest):