Merge "Fix type error on call to mount device" into stable/rocky

This commit is contained in:
Zuul 2019-08-01 21:31:47 +00:00 committed by Gerrit Code Review
commit af624f6efe
2 changed files with 3 additions and 1 deletions

View File

@ -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')

View File

@ -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)