From 83b9ad952dab4df8a99bff1c4cdb2db9c37481ab Mon Sep 17 00:00:00 2001 From: Rakesh H S Date: Mon, 16 Nov 2015 17:08:53 +0530 Subject: [PATCH] Convergence: Fix unittest test_updated_time Change-Id: I4df40e3f742750046913abef3a794e2440e5e7a2 --- heat/tests/test_convg_stack.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/heat/tests/test_convg_stack.py b/heat/tests/test_convg_stack.py index 39659f14c4..3614ad73e1 100644 --- a/heat/tests/test_convg_stack.py +++ b/heat/tests/test_convg_stack.py @@ -443,19 +443,23 @@ class StackConvergenceCreateUpdateDeleteTest(common.HeatTestCase): # should return resource with template id 2 which is prev template self.assertEqual(a_res_2.id, best_res.id) - def test_updated_time(self, mock_cr): + @mock.patch.object(parser.Stack, '_converge_create_or_update') + def test_updated_time_stack_create(self, mock_ccu, mock_cr): stack = parser.Stack(utils.dummy_context(), 'convg_updated_time_test', templatem.Template.create_empty_template()) - stack.store() - stack.create() + stack.converge_stack(template=stack.t, action=stack.CREATE) self.assertIsNone(stack.updated_time) + self.assertTrue(mock_ccu.called) + @mock.patch.object(parser.Stack, '_converge_create_or_update') + def test_updated_time_stack_update(self, mock_ccu, mock_cr): tmpl = {'HeatTemplateFormatVersion': '2012-12-12', 'Resources': {'R1': {'Type': 'GenericResourceType'}}} - newstack = parser.Stack(utils.dummy_context(), 'updated_time_test', - templatem.Template(tmpl)) - stack.update(newstack) + stack = parser.Stack(utils.dummy_context(), 'updated_time_test', + templatem.Template(tmpl)) + stack.converge_stack(template=stack.t, action=stack.UPDATE) self.assertIsNotNone(stack.updated_time) + self.assertTrue(mock_ccu.called) class TestConvgStackRollback(common.HeatTestCase):