openstack/heat
Code Issues Proposed changes

Rename mox_resource_id to mock_resource_id

Browse Source 
As we no longer use mox library it is misleading to keep
names starging with mox so let's rename this prefix
to mock_.

Change-Id: Ia376b9dcb7bf964df3c30f6757a6061c1850ee95
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
This commit is contained in:
Krzysztof Opasiak 2018-08-27 17:39:24 +02:00
parent 5f7d4d9930
commit ac75457cc9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/tests/generic_resource.py
View File

@ -184,9 +184,9 @@ class ResourceWithResourceID(GenericResource):
self.resource_id_set(self.properties.get('ID')) self.resource_id_set(self.properties.get('ID'))
def handle_delete(self): def handle_delete(self):
self.mox_resource_id(self.resource_id) self.mock_resource_id(self.resource_id)
def mox_resource_id(self, resource_id): def mock_resource_id(self, resource_id):
pass pass

8
heat/tests/test_stack_update.py
View File

@ -664,7 +664,7 @@ class StackUpdateTest(common.HeatTestCase):
mock_create = self.patchobject(generic_rsrc.ResourceWithResourceID, mock_create = self.patchobject(generic_rsrc.ResourceWithResourceID,
'handle_create', side_effect=Exception) 'handle_create', side_effect=Exception)
mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID, mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID,
'mox_resource_id', 'mock_resource_id',
return_value=None) return_value=None)
self.stack.update(updated_stack) self.stack.update(updated_stack)
@ -718,7 +718,7 @@ class StackUpdateTest(common.HeatTestCase):
'handle_create', 'handle_create',
side_effect=[None, Exception]) side_effect=[None, Exception])
mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID, mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID,
'mox_resource_id', return_value=None) 'mock_resource_id', return_value=None)
self.stack.update(updated_stack) self.stack.update(updated_stack)
# set resource_id for AResource because handle_create() is overwritten # set resource_id for AResource because handle_create() is overwritten
@ -772,7 +772,7 @@ class StackUpdateTest(common.HeatTestCase):
mock_create = self.patchobject(generic_rsrc.ResourceWithResourceID, mock_create = self.patchobject(generic_rsrc.ResourceWithResourceID,
'handle_create', side_effect=Exception) 'handle_create', side_effect=Exception)
mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID, mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID,
'mox_resource_id', return_value=None) 'mock_resource_id', return_value=None)
self.stack.update(updated_stack) self.stack.update(updated_stack)
# Override stack status and resources status for emulating # Override stack status and resources status for emulating
@ -827,7 +827,7 @@ class StackUpdateTest(common.HeatTestCase):
'handle_create', 'handle_create',
side_effect=[None, Exception]) side_effect=[None, Exception])
mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID, mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID,
'mox_resource_id', return_value=None) 'mock_resource_id', return_value=None)
self.stack.update(updated_stack) self.stack.update(updated_stack)
# set resource_id for AResource because handle_create() is mocked # set resource_id for AResource because handle_create() is mocked