Fix type error on call to mount device
The call in nova.virt.disk.mount.api.Mount.mnt_dev() to
nova.privsep.fs.mount() should include the `options` argument to
fulfill with the method signature.
The test test_do_mount_need_to_specify_fs_type has been modified to
check that the caller use the correct signature.
Closes-Bug: 1829506
Change-Id: Id14993db6ea33b2da14caa4b58671fc57c182706
Signed-off-by: Miguel Herranz <miguel@midokura.com>
(cherry picked from commit d2ef1ce309
)
This commit is contained in:
parent
73011cfe5e
commit
8371073ac7
|
@ -260,6 +260,8 @@ class NbdTestCase(test.NoDBTestCase):
|
|||
mount.map_dev = fake_returns_true
|
||||
|
||||
self.assertFalse(mount.do_mount())
|
||||
mock_mount.assert_called_once_with(
|
||||
None, None, tempdir, None)
|
||||
|
||||
@mock.patch('nova.privsep.fs.nbd_connect')
|
||||
@mock.patch('nova.privsep.fs.nbd_disconnect')
|
||||
|
|
|
@ -248,7 +248,7 @@ class Mount(object):
|
|||
LOG.debug("Mount %(dev)s on %(dir)s",
|
||||
{'dev': self.mapped_device, 'dir': self.mount_dir})
|
||||
out, err = nova.privsep.fs.mount(None, self.mapped_device,
|
||||
self.mount_dir)
|
||||
self.mount_dir, None)
|
||||
if err:
|
||||
self.error = _('Failed to mount filesystem: %s') % err
|
||||
LOG.debug(self.error)
|
||||
|
|
Loading…
Reference in New Issue