Merge "Fix type error on call to mount device" into stable/queens
This commit is contained in:
commit
6172009f95
|
@ -259,6 +259,8 @@ class NbdTestCase(test.NoDBTestCase):
|
||||||
mount.map_dev = fake_returns_true
|
mount.map_dev = fake_returns_true
|
||||||
|
|
||||||
self.assertFalse(mount.do_mount())
|
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_connect')
|
||||||
@mock.patch('nova.privsep.fs.nbd_disconnect')
|
@mock.patch('nova.privsep.fs.nbd_disconnect')
|
||||||
|
|
|
@ -248,7 +248,7 @@ class Mount(object):
|
||||||
LOG.debug("Mount %(dev)s on %(dir)s",
|
LOG.debug("Mount %(dev)s on %(dir)s",
|
||||||
{'dev': self.mapped_device, 'dir': self.mount_dir})
|
{'dev': self.mapped_device, 'dir': self.mount_dir})
|
||||||
out, err = nova.privsep.fs.mount(None, self.mapped_device,
|
out, err = nova.privsep.fs.mount(None, self.mapped_device,
|
||||||
self.mount_dir)
|
self.mount_dir, None)
|
||||||
if err:
|
if err:
|
||||||
self.error = _('Failed to mount filesystem: %s') % err
|
self.error = _('Failed to mount filesystem: %s') % err
|
||||||
LOG.debug(self.error)
|
LOG.debug(self.error)
|
||||||
|
|
Loading…
Reference in New Issue