openstack
/
heat
Code Issues Proposed changes

remove mox usage from test_queue 

Change-Id: Iabdacfc9caea330ac7c68a992e5fed4f918ebe6b
goal: mox-removal
This commit is contained in:
ricolin 2018-03-12 17:30:08 +08:00
parent 8389d9af0d
commit d406a33b6b
1 changed files with 44 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
heat/tests/openstack/zaqar/test_queue.py
View File

@ -64,18 +64,24 @@ class FakeQueue(object):
self._id = queue_name
self._auto_create = auto_create
self._exists = False
self._metadata = None
self._delete_called = False
self.metadata = mock.Mock()
self.delete = mock.Mock()
def metadata(self, new_meta=None):
pass
def delete(self):
pass
class FakeClient(object):
def __init__(self):
self.api_url = 'http://127.0.0.1:8888/'
self.api_version = 1.1
self.queue = mock.Mock()
class ZaqarMessageQueueTest(common.HeatTestCase):
def setUp(self):
super(ZaqarMessageQueueTest, self).setUp()
self.fc = self.m.CreateMockAnything()
self.fc = FakeClient()
self.patchobject(resource.Resource, 'client', return_value=self.fc)
self.ctx = utils.dummy_context()
def parse_stack(self, t):
@ -90,25 +96,17 @@ class ZaqarMessageQueueTest(common.HeatTestCase):
self.parse_stack(t)
queue = self.stack['MyQueue2']
self.m.StubOutWithMock(queue, 'client')
queue.client().MultipleTimes().AndReturn(self.fc)
queue_metadata = queue.properties.get('metadata')
fake_q = FakeQueue(queue.physical_resource_name(), auto_create=False)
self.m.StubOutWithMock(self.fc, 'queue')
self.fc.queue(queue.physical_resource_name(),
auto_create=False).AndReturn(fake_q)
self.m.StubOutWithMock(fake_q, 'metadata')
fake_q.metadata(new_meta=queue.properties.get('metadata'))
self.m.ReplayAll()
fake_q.metadata.return_value = queue_metadata
self.fc.queue.return_value = fake_q
scheduler.TaskRunner(queue.create)()
self.fc.api_url = 'http://127.0.0.1:8888/'
self.fc.api_version = 1.1
self.assertEqual('http://127.0.0.1:8888/v1.1/queues/myqueue',
queue.FnGetAtt('href'))
self.m.VerifyAll()
self.fc.queue.assert_called_once_with(queue.physical_resource_name(),
auto_create=False)
fake_q.metadata.assert_called_once_with(new_meta=queue_metadata)
def test_create_default_name(self):
t = template_format.parse(wp_template)
@ -116,26 +114,17 @@ class ZaqarMessageQueueTest(common.HeatTestCase):
self.parse_stack(t)
queue = self.stack['MyQueue2']
self.m.StubOutWithMock(queue, 'client')
queue.client().MultipleTimes().AndReturn(self.fc)
name_match = utils.PhysName(self.stack.name, 'MyQueue2')
self.m.StubOutWithMock(self.fc, 'queue')
self.fc.queue(name_match, auto_create=False).WithSideEffects(FakeQueue)
self.m.ReplayAll()
self.fc.queue.side_effect = FakeQueue
scheduler.TaskRunner(queue.create)()
queue_name = queue.physical_resource_name()
self.assertEqual(name_match, queue_name)
self.fc.api_url = 'http://127.0.0.1:8888'
self.fc.api_version = 2
self.assertEqual('http://127.0.0.1:8888/v2/queues/' + queue_name,
queue.FnGetAtt('href'))
self.m.VerifyAll()
self.fc.queue.assert_called_once_with(name_match, auto_create=False)
def test_delete(self):
t = template_format.parse(wp_template)
@ -143,21 +132,14 @@ class ZaqarMessageQueueTest(common.HeatTestCase):
queue = self.stack['MyQueue2']
queue.resource_id_set(queue.properties.get('name'))
self.m.StubOutWithMock(queue, 'client')
queue.client().MultipleTimes().AndReturn(self.fc)
fake_q = FakeQueue("myqueue", auto_create=False)
self.m.StubOutWithMock(self.fc, 'queue')
self.fc.queue("myqueue",
auto_create=False).MultipleTimes().AndReturn(fake_q)
self.m.StubOutWithMock(fake_q, 'delete')
fake_q.delete()
self.m.ReplayAll()
self.fc.queue.return_value = fake_q
scheduler.TaskRunner(queue.create)()
self.fc.queue.assert_called_once_with("myqueue", auto_create=False)
scheduler.TaskRunner(queue.delete)()
self.m.VerifyAll()
fake_q.delete.assert_called()
@mock.patch.object(queue.ZaqarQueue, "client")
def test_delete_not_found(self, mockclient):
@ -197,42 +179,29 @@ class ZaqarMessageQueueTest(common.HeatTestCase):
self.parse_stack(t)
queue = self.stack['MyQueue2']
queue.resource_id_set(queue.properties.get('name'))
self.m.StubOutWithMock(queue, 'client')
queue.client().MultipleTimes().AndReturn(self.fc)
fake_q = FakeQueue('myqueue', auto_create=False)
self.m.StubOutWithMock(self.fc, 'queue')
self.fc.queue('myqueue',
auto_create=False).MultipleTimes().AndReturn(fake_q)
self.m.StubOutWithMock(fake_q, 'metadata')
fake_q.metadata(new_meta={"key1": {"key2": "value", "key3": [1, 2]}})
# Expected to be called during update
fake_q.metadata(new_meta={'key1': 'value'})
self.m.ReplayAll()
self.fc.queue.return_value = fake_q
t = template_format.parse(wp_template)
new_queue = t['Resources']['MyQueue2']
new_queue['Properties']['metadata'] = {'key1': 'value'}
resource_defns = template.Template(t).resource_definitions(self.stack)
scheduler.TaskRunner(queue.create)()
self.fc.queue.assert_called_once_with("myqueue", auto_create=False)
fake_q.metadata.assert_called_with(new_meta={'key1': {'key2': 'value',
'key3': [1, 2]}})
scheduler.TaskRunner(queue.update, resource_defns['MyQueue2'])()
self.m.VerifyAll()
fake_q.metadata.assert_called_with(
new_meta={'key1': 'value'})
def test_update_replace(self):
t = template_format.parse(wp_template)
self.parse_stack(t)
queue = self.stack['MyQueue2']
queue.resource_id_set(queue.properties.get('name'))
self.m.StubOutWithMock(queue, 'client')
queue.client().MultipleTimes().AndReturn(self.fc)
fake_q = FakeQueue('myqueue', auto_create=False)
self.m.StubOutWithMock(self.fc, 'queue')
self.fc.queue('myqueue',
auto_create=False).MultipleTimes().AndReturn(fake_q)
self.m.ReplayAll()
self.fc.queue.return_value = fake_q
t = template_format.parse(wp_template)
t['Resources']['MyQueue2']['Properties']['name'] = 'new_queue'
@ -240,69 +209,50 @@ class ZaqarMessageQueueTest(common.HeatTestCase):
new_queue = resource_defns['MyQueue2']
scheduler.TaskRunner(queue.create)()
self.fc.queue.assert_called_once_with("myqueue", auto_create=False)
err = self.assertRaises(resource.UpdateReplace,
scheduler.TaskRunner(queue.update,
new_queue))
msg = 'The Resource MyQueue2 requires replacement.'
self.assertEqual(msg, six.text_type(err))
self.m.VerifyAll()
def test_show_resource(self):
t = template_format.parse(wp_template)
self.parse_stack(t)
queue = self.stack['MyQueue2']
self.m.StubOutWithMock(queue, 'client')
queue.client().MultipleTimes().AndReturn(self.fc)
fake_q = FakeQueue(queue.physical_resource_name(), auto_create=False)
self.m.StubOutWithMock(self.fc, 'queue')
self.fc.queue(queue.physical_resource_name(),
auto_create=False).AndReturn(fake_q)
self.m.StubOutWithMock(fake_q, 'metadata')
fake_q.metadata(new_meta=queue.properties.get('metadata'))
self.fc.queue(queue.physical_resource_name(),
auto_create=False).AndReturn(fake_q)
fake_q.metadata().AndReturn(
{"key1": {"key2": "value", "key3": [1, 2]}})
self.m.ReplayAll()
queue_metadata = queue.properties.get('metadata')
fake_q.metadata.return_value = queue_metadata
self.fc.queue.return_value = fake_q
scheduler.TaskRunner(queue.create)()
self.fc.queue.assert_called_once_with(queue.physical_resource_name(),
auto_create=False)
self.assertEqual(
{'metadata': {"key1": {"key2": "value", "key3": [1, 2]}}},
queue._show_resource())
self.m.VerifyAll()
fake_q.metadata.assert_called_with()
def test_parse_live_resource_data(self):
t = template_format.parse(wp_template)
self.parse_stack(t)
queue = self.stack['MyQueue2']
self.m.StubOutWithMock(queue, 'client')
queue.client().MultipleTimes().AndReturn(self.fc)
fake_q = FakeQueue(queue.physical_resource_name(), auto_create=False)
self.m.StubOutWithMock(self.fc, 'queue')
self.fc.queue(queue.physical_resource_name(),
auto_create=False).AndReturn(fake_q)
self.m.StubOutWithMock(fake_q, 'metadata')
fake_q.metadata(new_meta=queue.properties.get('metadata'))
self.fc.queue(queue.physical_resource_name(),
auto_create=False).AndReturn(fake_q)
fake_q.metadata().AndReturn(
{"key1": {"key2": "value", "key3": [1, 2]}})
self.m.ReplayAll()
self.fc.queue.return_value = fake_q
queue_metadata = queue.properties.get('metadata')
fake_q.metadata.return_value = queue_metadata
scheduler.TaskRunner(queue.create)()
fake_q.metadata.assert_called_with(new_meta=queue_metadata)
self.fc.queue.assert_called_once_with(queue.physical_resource_name(),
auto_create=False)
self.assertEqual(
{'metadata': {"key1": {"key2": "value", "key3": [1, 2]}},
'name': queue.resource_id},
queue.parse_live_resource_data(queue.properties,
queue._show_resource()))
self.m.VerifyAll()
fake_q.metadata.assert_called_with()
class ZaqarSignedQueueURLTest(common.HeatTestCase):