From c355f6608db71cd4b9654db053e291eb2a08cc8d Mon Sep 17 00:00:00 2001 From: rabi Date: Thu, 8 Mar 2018 17:02:24 +0530 Subject: [PATCH] Remove mox usage from test_heat_autoscaling_policy Change-Id: I6d0c905a0e8a9b42ca5964403ad0ac74175e24f1 goal: mox_removal --- .../autoscaling/test_heat_scaling_policy.py | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/heat/tests/autoscaling/test_heat_scaling_policy.py b/heat/tests/autoscaling/test_heat_scaling_policy.py index dd831379d4..1ff7339264 100644 --- a/heat/tests/autoscaling/test_heat_scaling_policy.py +++ b/heat/tests/autoscaling/test_heat_scaling_policy.py @@ -162,11 +162,9 @@ class ScalingPolicyAttrTest(common.HeatTestCase): self.policy.state) def test_alarm_attribute(self): - self.m.StubOutWithMock(self.stack.clients.client_plugin('heat'), - 'get_heat_cfn_url') - self.stack.clients.client_plugin('heat').get_heat_cfn_url().AndReturn( - 'http://server.test:8000/v1') - self.m.ReplayAll() + heat_plugin = self.stack.clients.client_plugin('heat') + heat_plugin.get_heat_cfn_url = mock.Mock( + return_value='http://server.test:8000/v1') alarm_url = self.policy.FnGetAtt('alarm_url') base = alarm_url.split('?')[0].split('%3A') self.assertEqual('http://server.test:8000/v1/signal/arn', base[0]) @@ -186,30 +184,23 @@ class ScalingPolicyAttrTest(common.HeatTestCase): self.assertEqual('SignatureMethod', args[2].split('=')[0]) self.assertEqual('SignatureVersion', args[3].split('=')[0]) self.assertEqual('Timestamp', args[4].split('=')[0]) - self.m.VerifyAll() def test_signal_attribute(self): - self.m.StubOutWithMock(self.stack.clients.client_plugin('heat'), - 'get_heat_url') - self.stack.clients.client_plugin('heat').get_heat_url().AndReturn( - 'http://server.test:8000/v1/') - self.m.ReplayAll() + heat_plugin = self.stack.clients.client_plugin('heat') + heat_plugin.get_heat_url = mock.Mock( + return_value='http://server.test:8000/v1/') self.assertEqual( 'http://server.test:8000/v1/test_tenant_id/stacks/' '%s/%s/resources/my-policy/signal' % ( self.stack.name, self.stack.id), self.policy.FnGetAtt('signal_url')) - self.m.VerifyAll() def test_signal_attribute_with_prefix(self): - self.m.StubOutWithMock(self.stack.clients.client_plugin('heat'), - 'get_heat_url') - self.stack.clients.client_plugin('heat').get_heat_url().AndReturn( - 'http://server.test/heat-api/v1/1234') - self.m.ReplayAll() + heat_plugin = self.stack.clients.client_plugin('heat') + heat_plugin.get_heat_url = mock.Mock( + return_value='http://server.test/heat-api/v1/1234') self.assertEqual( 'http://server.test/heat-api/v1/test_tenant_id/stacks/' '%s/%s/resources/my-policy/signal' % ( self.stack.name, self.stack.id), self.policy.FnGetAtt('signal_url')) - self.m.VerifyAll()