openstack/cinder
Code Issues Proposed changes

Merge "Tests: Fix rbd unit test failure due to ceph keyring file"

Browse Source
This commit is contained in:
Zuul 2021-01-06 19:33:35 +00:00 committed by Gerrit Code Review
commit 662bb58517
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1657,7 +1657,8 @@ class RBDTestCase(test.TestCase):
# OpenStack usage doesn't have the rbd_keyring_conf Oslo Config option
cfg_file = '/etc/ceph/ceph.client.admin.keyring'
self.driver.configuration.rbd_keyring_conf = cfg_file
self.driver._set_keyring_attributes()
with mock.patch('os.path.isfile', return_value=False):
self.driver._set_keyring_attributes()
self.assertEqual(cfg_file, self.driver.keyring_file)
self.assertIsNone(self.driver.keyring_data)