openstack
/
nova
Code Issues Proposed changes

Remove mox from api/openstack/compute/test_deferred_delete.py 

Replaced mox with mock in
nova/tests/unit/api/openstack/compute/test_deferred_delete.py

blueprint remove-mox-pike

Change-Id: I67010f2c707a52a838fbd3542712d33f36c8bb6a
This commit is contained in:
Dao Cong Tien 2016-05-24 17:32:23 +07:00 committed by Ghanshyam Mann
parent 34f4b1bd68
commit 45b2110972
1 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
nova/tests/unit/api/openstack/compute/test_deferred_delete.py
View File

@ -41,18 +41,13 @@ class DeferredDeleteExtensionTestV21(test.NoDBTestCase):
self.fake_req = FakeRequest(self.fake_context)
self.extension = self.ext_ver()
def test_force_delete(self):
self.mox.StubOutWithMock(compute_api.API, 'get')
self.mox.StubOutWithMock(compute_api.API, 'force_delete')
@mock.patch.object(compute_api.API, 'get')
@mock.patch.object(compute_api.API, 'force_delete')
def test_force_delete(self, mock_force_delete, mock_get):
instance = fake_instance.fake_instance_obj(
self.fake_req.environ['nova.context'])
mock_get.return_value = instance
compute_api.API.get(self.fake_context, self.fake_uuid,
expected_attrs=None).AndReturn(instance)
compute_api.API.force_delete(self.fake_context, instance)
self.mox.ReplayAll()
res = self.extension._force_delete(self.fake_req, self.fake_uuid,
self.fake_input_dict)
# NOTE: on v2.1, http status code is set as wsgi_code of API
@ -63,20 +58,27 @@ class DeferredDeleteExtensionTestV21(test.NoDBTestCase):
status_int = res.status_int
self.assertEqual(202, status_int)
def test_force_delete_instance_not_found(self):
self.mox.StubOutWithMock(compute_api.API, 'get')
mock_get.assert_called_once_with(self.fake_context,
self.fake_uuid,
expected_attrs=None)
mock_force_delete.assert_called_once_with(self.fake_context,
instance)
compute_api.API.get(self.fake_context, self.fake_uuid,
expected_attrs=None).AndRaise(
exception.InstanceNotFound(instance_id='instance-0000'))
@mock.patch.object(compute_api.API, 'get')
def test_force_delete_instance_not_found(self, mock_get):
mock_get.side_effect = exception.InstanceNotFound(
instance_id='instance-0000')
self.mox.ReplayAll()
self.assertRaises(webob.exc.HTTPNotFound,
self.extension._force_delete,
self.fake_req,
self.fake_uuid,
self.fake_input_dict)
mock_get.assert_called_once_with(self.fake_context,
self.fake_uuid,
expected_attrs=None)
@mock.patch.object(compute_api.API, 'get')
@mock.patch.object(compute_api.API, 'force_delete',
side_effect=exception.InstanceIsLocked(
@ -113,17 +115,13 @@ class DeferredDeleteExtensionTestV21(test.NoDBTestCase):
self.assertIn('Cell is not known for instance fake_uuid',
ex.explanation)
def test_restore(self):
self.mox.StubOutWithMock(compute_api.API, 'get')
self.mox.StubOutWithMock(compute_api.API, 'restore')
@mock.patch.object(compute_api.API, 'get')
@mock.patch.object(compute_api.API, 'restore')
def test_restore(self, mock_restore, mock_get):
instance = fake_instance.fake_instance_obj(
self.fake_req.environ['nova.context'])
mock_get.return_value = instance
fake_instance = 'fake_instance'
compute_api.API.get(self.fake_context, self.fake_uuid,
expected_attrs=None).AndReturn(fake_instance)
compute_api.API.restore(self.fake_context, fake_instance)
self.mox.ReplayAll()
res = self.extension._restore(self.fake_req, self.fake_uuid,
self.fake_input_dict)
# NOTE: on v2.1, http status code is set as wsgi_code of API
@ -134,36 +132,46 @@ class DeferredDeleteExtensionTestV21(test.NoDBTestCase):
status_int = res.status_int
self.assertEqual(202, status_int)
def test_restore_instance_not_found(self):
self.mox.StubOutWithMock(compute_api.API, 'get')
mock_get.assert_called_once_with(self.fake_context,
self.fake_uuid,
expected_attrs=None)
mock_restore.assert_called_once_with(self.fake_context,
instance)
compute_api.API.get(self.fake_context, self.fake_uuid,
expected_attrs=None).AndRaise(
exception.InstanceNotFound(instance_id='instance-0000'))
@mock.patch.object(compute_api.API, 'get')
def test_restore_instance_not_found(self, mock_get):
mock_get.side_effect = exception.InstanceNotFound(
instance_id='instance-0000')
self.mox.ReplayAll()
self.assertRaises(webob.exc.HTTPNotFound, self.extension._restore,
self.fake_req, self.fake_uuid,
self.fake_input_dict)
def test_restore_raises_conflict_on_invalid_state(self):
self.mox.StubOutWithMock(compute_api.API, 'get')
self.mox.StubOutWithMock(compute_api.API, 'restore')
mock_get.assert_called_once_with(self.fake_context,
self.fake_uuid,
expected_attrs=None)
fake_instance = 'fake_instance'
exc = exception.InstanceInvalidState(attr='fake_attr',
state='fake_state', method='fake_method',
instance_uuid='fake')
@mock.patch.object(compute_api.API, 'get')
@mock.patch.object(compute_api.API, 'restore')
def test_restore_raises_conflict_on_invalid_state(self,
mock_restore, mock_get):
instance = fake_instance.fake_instance_obj(
self.fake_req.environ['nova.context'])
mock_get.return_value = instance
mock_restore.side_effect = exception.InstanceInvalidState(
attr='fake_attr', state='fake_state', method='fake_method',
instance_uuid='fake')
compute_api.API.get(self.fake_context, self.fake_uuid,
expected_attrs=None).AndReturn(fake_instance)
compute_api.API.restore(self.fake_context, fake_instance).AndRaise(
exc)
self.mox.ReplayAll()
self.assertRaises(webob.exc.HTTPConflict, self.extension._restore,
self.fake_req, self.fake_uuid, self.fake_input_dict)
mock_get.assert_called_once_with(self.fake_context,
self.fake_uuid,
expected_attrs=None)
mock_restore.assert_called_once_with(self.fake_context,
instance)
class DeferredDeletePolicyEnforcementV21(test.NoDBTestCase):