openstack
/
nova
Code Issues Proposed changes

Merge "Decouple NVMe tests from os-brick"

This commit is contained in:
Zuul 2019-09-07 12:23:15 +00:00 committed by Gerrit Code Review
parent b879f1b6df e840135a17
commit c51187ab5b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nova/tests/unit/virt/libvirt/volume/test_nvme.py
View File

@ -15,16 +15,22 @@ import mock
from nova.tests.unit.virt.libvirt.volume import test_volume from nova.tests.unit.virt.libvirt.volume import test_volume
from nova.virt.libvirt.volume import nvme from nova.virt.libvirt.volume import nvme
from os_brick.initiator import connector from os_brick import initiator
class LibvirtNVMEVolumeDriverTestCase(test_volume.LibvirtVolumeBaseTestCase): class LibvirtNVMEVolumeDriverTestCase(test_volume.LibvirtVolumeBaseTestCase):
@mock.patch('os.path.exists', return_value=True) @mock.patch('os.path.exists', return_value=True)
def test_libvirt_nvme_driver(self, exists): @mock.patch('nova.utils.get_root_helper')
libvirt_driver = nvme.LibvirtNVMEVolumeDriver(self.fake_host) @mock.patch('os_brick.initiator.connector.InitiatorConnector.factory')
self.assertIsInstance(libvirt_driver.connector, def test_libvirt_nvme_driver(self, mock_factory, mock_helper, exists):
connector.NVMeConnector) self.flags(num_nvme_discover_tries=3, group='libvirt')
mock_helper.return_value = 'sudo'
nvme.LibvirtNVMEVolumeDriver(self.fake_host)
mock_factory.assert_called_once_with(
initiator.NVME, 'sudo',
device_scan_attempts=3)
def test_libvirt_nvme_driver_connect(self): def test_libvirt_nvme_driver_connect(self):
nvme_driver = nvme.LibvirtNVMEVolumeDriver(self.fake_host) nvme_driver = nvme.LibvirtNVMEVolumeDriver(self.fake_host)