Fix wrong usage of assertRaises
In some of the unit tests, assertRaises method is not used in the intended
manner.
Example: self.assertRaises(exceptions.VimFaultException,
lambda: api_session.invoke_api(module, 'api'))
This change fixes such usage.
Change-Id: Ia66ee33c90e333aa4378d797d1fecb62731bab11
Closes-Bug: #1338458
This commit is contained in:
Vipin Balachandran
parent
5ef9f2918c
commit
bcf2ff400c
@ -273,7 +273,9 @@ class VMwareAPISessionTest(base.TestCase):
|
||||
module = mock.Mock()
|
||||
module.api = api
|
||||
self.assertRaises(exceptions.VimFaultException,
|
||||
lambda: api_session.invoke_api(module, 'api'))
|
||||
api_session.invoke_api,
|
||||
module,
|
||||
'api')
|
||||
|
||||
def test_invoke_api_with_empty_response(self):
|
||||
api_session = self._create_api_session(True)
|
||||
@ -360,7 +362,8 @@ class VMwareAPISessionTest(base.TestCase):
|
||||
task = mock.Mock()
|
||||
with mock.patch.object(greenthread, 'sleep'):
|
||||
self.assertRaises(exceptions.VMwareDriverException,
|
||||
lambda: api_session.wait_for_task(task))
|
||||
api_session.wait_for_task,
|
||||
task)
|
||||
api_session.invoke_api.assert_called_with(vim_util,
|
||||
'get_object_property',
|
||||
api_session.vim, task,
|
||||
@ -375,7 +378,8 @@ class VMwareAPISessionTest(base.TestCase):
|
||||
task = mock.Mock()
|
||||
with mock.patch.object(greenthread, 'sleep'):
|
||||
self.assertRaises(exceptions.VimException,
|
||||
lambda: api_session.wait_for_task(task))
|
||||
api_session.wait_for_task,
|
||||
task)
|
||||
api_session.invoke_api.assert_called_once_with(vim_util,
|
||||
'get_object_property',
|
||||
api_session.vim, task,
|
||||
@ -410,7 +414,8 @@ class VMwareAPISessionTest(base.TestCase):
|
||||
lease = mock.Mock()
|
||||
with mock.patch.object(greenthread, 'sleep'):
|
||||
self.assertRaises(exceptions.VimException,
|
||||
lambda: api_session.wait_for_lease_ready(lease))
|
||||
api_session.wait_for_lease_ready,
|
||||
lease)
|
||||
exp_calls = [mock.call(vim_util, 'get_object_property',
|
||||
api_session.vim, lease, 'state')] * 2
|
||||
exp_calls.append(mock.call(vim_util, 'get_object_property',
|
||||
@ -426,7 +431,8 @@ class VMwareAPISessionTest(base.TestCase):
|
||||
api_session.invoke_api = mock.Mock(side_effect=invoke_api_side_effect)
|
||||
lease = mock.Mock()
|
||||
self.assertRaises(exceptions.VimException,
|
||||
lambda: api_session.wait_for_lease_ready(lease))
|
||||
api_session.wait_for_lease_ready,
|
||||
lease)
|
||||
api_session.invoke_api.assert_called_once_with(vim_util,
|
||||
'get_object_property',
|
||||
api_session.vim,
|
||||
@ -438,7 +444,8 @@ class VMwareAPISessionTest(base.TestCase):
|
||||
side_effect=exceptions.VimException(None))
|
||||
lease = mock.Mock()
|
||||
self.assertRaises(exceptions.VimException,
|
||||
lambda: api_session.wait_for_lease_ready(lease))
|
||||
api_session.wait_for_lease_ready,
|
||||
lease)
|
||||
api_session.invoke_api.assert_called_once_with(
|
||||
vim_util, 'get_object_property', api_session.vim, lease,
|
||||
'state')
|
||||
@ -463,7 +470,8 @@ class VMwareAPISessionTest(base.TestCase):
|
||||
mock.patch.object(api_session, 'invoke_api', fake_invoke_api)
|
||||
):
|
||||
self.assertRaises(expected_exception,
|
||||
api_session._poll_task, 'fake-task')
|
||||
api_session._poll_task,
|
||||
'fake-task')
|
||||
|
||||
def test_poll_task_well_known_exceptions(self):
|
||||
for k, v in exceptions._fault_classes_registry.iteritems():
|
||||
|
||||
@ -119,13 +119,14 @@ class VmdkWriteHandleTest(base.TestCase):
|
||||
def test_init_failure(self):
|
||||
session = self._create_mock_session(False)
|
||||
self.assertRaises(exceptions.VimException,
|
||||
lambda: rw_handles.VmdkWriteHandle(session,
|
||||
'10.1.2.3',
|
||||
443,
|
||||
'rp-1',
|
||||
'folder-1',
|
||||
None,
|
||||
100))
|
||||
rw_handles.VmdkWriteHandle,
|
||||
session,
|
||||
'10.1.2.3',
|
||||
443,
|
||||
'rp-1',
|
||||
'folder-1',
|
||||
None,
|
||||
100)
|
||||
|
||||
def test_write(self):
|
||||
session = self._create_mock_session()
|
||||
@ -217,12 +218,13 @@ class VmdkReadHandleTest(base.TestCase):
|
||||
def test_init_failure(self):
|
||||
session = self._create_mock_session(False)
|
||||
self.assertRaises(exceptions.VimException,
|
||||
lambda: rw_handles.VmdkReadHandle(session,
|
||||
'10.1.2.3',
|
||||
443,
|
||||
'vm-1',
|
||||
'[ds] disk1.vmdk',
|
||||
100))
|
||||
rw_handles.VmdkReadHandle,
|
||||
session,
|
||||
'10.1.2.3',
|
||||
443,
|
||||
'vm-1',
|
||||
'[ds] disk1.vmdk',
|
||||
100)
|
||||
|
||||
def test_read(self):
|
||||
chunk_size = rw_handles.READ_CHUNKSIZE
|
||||
|
||||
@ -122,7 +122,8 @@ class VimTest(base.TestCase):
|
||||
service_mock = vim_obj._client.service
|
||||
setattr(service_mock, attr_name, side_effect)
|
||||
self.assertRaises(exceptions.VimFaultException,
|
||||
lambda: vim_obj.retrievePropertiesEx(managed_object))
|
||||
vim_obj.retrievePropertiesEx,
|
||||
managed_object)
|
||||
|
||||
def test_vim_request_handler_with_web_fault(self):
|
||||
managed_object = 'VirtualMachine'
|
||||
@ -165,7 +166,8 @@ class VimTest(base.TestCase):
|
||||
service_mock = mock.Mock(spec=vim.Vim)
|
||||
vim_obj._client.service = service_mock
|
||||
self.assertRaises(exceptions.VimAttributeException,
|
||||
lambda: vim_obj.powerOn(managed_object))
|
||||
vim_obj.powerOn,
|
||||
managed_object)
|
||||
|
||||
def test_vim_request_handler_with_http_cannot_send_error(self):
|
||||
managed_object = 'VirtualMachine'
|
||||
@ -180,7 +182,8 @@ class VimTest(base.TestCase):
|
||||
service_mock = vim_obj._client.service
|
||||
setattr(service_mock, attr_name, side_effect)
|
||||
self.assertRaises(exceptions.VimSessionOverLoadException,
|
||||
lambda: vim_obj.powerOn(managed_object))
|
||||
vim_obj.powerOn,
|
||||
managed_object)
|
||||
|
||||
def test_vim_request_handler_with_http_response_not_ready_error(self):
|
||||
managed_object = 'VirtualMachine'
|
||||
@ -195,7 +198,8 @@ class VimTest(base.TestCase):
|
||||
service_mock = vim_obj._client.service
|
||||
setattr(service_mock, attr_name, side_effect)
|
||||
self.assertRaises(exceptions.VimSessionOverLoadException,
|
||||
lambda: vim_obj.powerOn(managed_object))
|
||||
vim_obj.powerOn,
|
||||
managed_object)
|
||||
|
||||
def test_vim_request_handler_with_http_cannot_send_header_error(self):
|
||||
managed_object = 'VirtualMachine'
|
||||
@ -210,7 +214,8 @@ class VimTest(base.TestCase):
|
||||
service_mock = vim_obj._client.service
|
||||
setattr(service_mock, attr_name, side_effect)
|
||||
self.assertRaises(exceptions.VimSessionOverLoadException,
|
||||
lambda: vim_obj.powerOn(managed_object))
|
||||
vim_obj.powerOn,
|
||||
managed_object)
|
||||
|
||||
def test_vim_request_handler_with_url_error(self):
|
||||
managed_object = 'VirtualMachine'
|
||||
@ -225,7 +230,8 @@ class VimTest(base.TestCase):
|
||||
service_mock = vim_obj._client.service
|
||||
setattr(service_mock, attr_name, side_effect)
|
||||
self.assertRaises(exceptions.VimConnectionException,
|
||||
lambda: vim_obj.powerOn(managed_object))
|
||||
vim_obj.powerOn,
|
||||
managed_object)
|
||||
|
||||
def test_vim_request_handler_with_http_error(self):
|
||||
managed_object = 'VirtualMachine'
|
||||
@ -240,7 +246,8 @@ class VimTest(base.TestCase):
|
||||
service_mock = vim_obj._client.service
|
||||
setattr(service_mock, attr_name, side_effect)
|
||||
self.assertRaises(exceptions.VimConnectionException,
|
||||
lambda: vim_obj.powerOn(managed_object))
|
||||
vim_obj.powerOn,
|
||||
managed_object)
|
||||
|
||||
@mock.patch.object(vim_util, 'get_moref', return_value=None)
|
||||
def test_vim_request_handler_no_value(self, mock_moref):
|
||||
@ -261,7 +268,7 @@ class VimTest(base.TestCase):
|
||||
attr_name = 'powerOn'
|
||||
service_mock = vim_obj._client.service
|
||||
setattr(service_mock, attr_name, side_effect)
|
||||
self.assertRaises(exception, lambda: vim_obj.powerOn(managed_object))
|
||||
self.assertRaises(exception, vim_obj.powerOn, managed_object)
|
||||
|
||||
def test_vim_request_handler_with_address_in_use_error(self):
|
||||
self._test_vim_request_handler_with_exception(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user