Skip to content

Commit f551447

Browse files
committed
Optimize _local_delete calls by compute unit tests
_fake_do_delete function from nova/tests/unit/compute/test_api.py is called with reservations=None argument. This argument is no longer used in _local_delete. Since_fake_do_delete function is not really used because it only contains pass statement, we can replace it with no op call implemented using lambda function. Change-Id: Idf9686afeadc2d000c3bc255e809c914967a063f
1 parent d869163 commit f551447

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

nova/tests/unit/compute/test_api.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,10 +1353,6 @@ def test_delete_fast_if_host_not_set(self, mock_br_get, mock_save,
13531353
self.context, instance_uuid, constraint='constraint',
13541354
hard_delete=False)
13551355

1356-
def _fake_do_delete(context, instance, bdms,
1357-
reservations=None, local=False):
1358-
pass
1359-
13601356
@mock.patch.object(compute_utils, 'notify_about_instance_action')
13611357
@mock.patch.object(objects.BlockDeviceMapping, 'destroy')
13621358
@mock.patch.object(cinder.API, 'detach')
@@ -1378,9 +1374,11 @@ def test_local_delete_with_deleted_volume(
13781374
mock_elevated.return_value = self.context
13791375
mock_detach.side_effect = exception.VolumeNotFound('volume_id')
13801376

1377+
# lambda function is used to run no op call as a delete function
1378+
# called by compute_api._local_delete
13811379
self.compute_api._local_delete(self.context, inst, bdms,
13821380
'delete',
1383-
self._fake_do_delete)
1381+
lambda *args, **kwargs: None)
13841382

13851383
mock_notify_legacy.assert_has_calls([
13861384
mock.call(self.compute_api.notifier, self.context,
@@ -1416,8 +1414,11 @@ def test_local_delete_for_arqs(
14161414
inst._context = self.context
14171415
mock_elevated.return_value = self.context
14181416
bdms = []
1417+
# lambda function is used to run no op call as a delete function
1418+
# called by compute_api._local_delete
14191419
self.compute_api._local_delete(self.context, inst, bdms,
1420-
'delete', self._fake_do_delete)
1420+
'delete',
1421+
lambda *args, **kwargs: None)
14211422
mock_del_arqs.assert_called_once_with(self.context, inst)
14221423

14231424
@mock.patch.object(objects.BlockDeviceMapping, 'destroy')

0 commit comments

Comments
 (0)