openstack/cinder
Code Issues Proposed changes

Merge "Tests: RBD: Refactor mocks"

Browse Source
This commit is contained in:
Zuul 2022-08-17 21:50:35 +00:00 committed by Gerrit Code Review
commit e93c99bfae
1 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cinder/tests/unit/volume/drivers/test_rbd.py
View File

@ -867,21 +867,20 @@ class RBDTestCase(test.TestCase):
self.mock_rbd.RBD.return_value.remove.side_effect = ( self.mock_rbd.RBD.return_value.remove.side_effect = (
self.mock_rbd.ImageBusy) self.mock_rbd.ImageBusy)
with mock.patch.object(self.driver, '_get_clone_info') as \ mock_get_clone_info = self.mock_object(self.driver, '_get_clone_info')
mock_get_clone_info:
mock_get_clone_info.return_value = (None, None, None) mock_get_clone_info.return_value = (None, None, None)
with mock.patch.object(self.driver, '_delete_backup_snaps') as \
mock_delete_backup_snaps: mock_delete_backup_snaps = self.mock_object(self.driver,
with mock.patch.object(driver, 'RADOSClient') as \ '_delete_backup_snaps')
mock_rados_client: mock_rados_client = self.mock_object(driver, 'RADOSClient')
self.driver.delete_volume(self.volume_a) self.driver.delete_volume(self.volume_a)
mock_get_clone_info.assert_called_once_with( mock_get_clone_info.assert_called_once_with(
self.mock_rbd.Image.return_value, self.mock_rbd.Image.return_value,
self.volume_a.name, self.volume_a.name,
None) None)
(self.mock_rbd.Image.return_value.list_snaps self.mock_rbd.Image.return_value.list_snaps.assert_called_once_with()
.assert_called_once_with())
mock_rados_client.assert_called_once_with(self.driver) mock_rados_client.assert_called_once_with(self.driver)
mock_delete_backup_snaps.assert_called_once_with( mock_delete_backup_snaps.assert_called_once_with(
self.mock_rbd.Image.return_value) self.mock_rbd.Image.return_value)
@ -947,20 +946,19 @@ class RBDTestCase(test.TestCase):
self.mock_rbd.RBD.return_value.remove.side_effect = ( self.mock_rbd.RBD.return_value.remove.side_effect = (
self.mock_rbd.ImageNotFound) self.mock_rbd.ImageNotFound)
with mock.patch.object(self.driver, '_get_clone_info') as \ mock_delete_backup_snaps = self.mock_object(self.driver,
mock_get_clone_info: '_delete_backup_snaps')
mock_rados_client = self.mock_object(driver, 'RADOSClient')
mock_get_clone_info = self.mock_object(self.driver, '_get_clone_info')
mock_get_clone_info.return_value = (None, None, None) mock_get_clone_info.return_value = (None, None, None)
with mock.patch.object(self.driver, '_delete_backup_snaps') as \
mock_delete_backup_snaps:
with mock.patch.object(driver, 'RADOSClient') as \
mock_rados_client:
self.assertIsNone(self.driver.delete_volume(self.volume_a)) self.assertIsNone(self.driver.delete_volume(self.volume_a))
mock_get_clone_info.assert_called_once_with( mock_get_clone_info.assert_called_once_with(
self.mock_rbd.Image.return_value, self.mock_rbd.Image.return_value,
self.volume_a.name, self.volume_a.name,
None) None)
(self.mock_rbd.Image.return_value.list_snaps self.mock_rbd.Image.return_value.list_snaps.assert_called_once_with()
.assert_called_once_with())
mock_rados_client.assert_called_once_with(self.driver) mock_rados_client.assert_called_once_with(self.driver)
mock_delete_backup_snaps.assert_called_once_with( mock_delete_backup_snaps.assert_called_once_with(
self.mock_rbd.Image.return_value) self.mock_rbd.Image.return_value)