openstack/cinder
Code Issues Proposed changes

Merge "Tests: Fix double mocking in test_rbd"

Browse Source
This commit is contained in:
Zuul 2024-10-30 15:40:24 +00:00 committed by Gerrit Code Review
commit a3151a1cb0
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1846,11 +1846,8 @@ class RBDTestCase(test.TestCase):
self.driver.copy_image_to_volume(*args)
@mock.patch('cinder.volume.drivers.rbd.fileutils.delete_if_exists')
@mock.patch('cinder.volume.volume_utils.check_encryption_provider',
return_value={'encryption_key_id': fake.ENCRYPTION_KEY_ID})
@mock.patch('cinder.image.image_utils.convert_image')
def _copy_image_encrypted(self, mock_convert, mock_encrypt_key,
mock_temp_delete):
def _copy_image_encrypted(self, mock_convert, mock_temp_delete):
key_mgr = fake_keymgr.fake_api()
self.mock_object(castellan.key_manager, 'API', return_value=key_mgr)
key_id = key_mgr.store(self.context, KeyObject())