openstack/nova
Code Issues Proposed changes

Merge "Remove mox from unit/virt/libvirt/test_imagebackend.py (end)"

Browse Source
This commit is contained in:
Jenkins 2017-02-13 13:36:37 +00:00 committed by Gerrit Code Review
commit 9a44d56f65
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nova/tests/unit/virt/libvirt/test_imagebackend.py
View File

@ -134,16 +134,18 @@ class _ImageTestCase(object):
def fake_fetch(target, *args, **kwargs): def fake_fetch(target, *args, **kwargs):
return return
self.stubs.Set(image, 'exists', lambda: True) with test.nested(
self.stubs.Set(image, '_can_fallocate', lambda: True) mock.patch.object(image, 'exists', lambda: True),
self.stubs.Set(image, 'get_disk_size', lambda _: self.SIZE) mock.patch.object(image, '_can_fallocate', lambda: True),
self.stub_out('os.path.exists', lambda _: True) mock.patch.object(image, 'get_disk_size', lambda _: self.SIZE)
self.stub_out('os.access', lambda p, w: False) ) as (mock_exists, mock_can, mock_get):
self.stub_out('os.path.exists', lambda _: True)
self.stub_out('os.access', lambda p, w: False)
# Testing fallocate is only called when user has write access. # Testing fallocate is only called when user has write access.
image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE) image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
self.assertEqual(fake_processutils.fake_execute_get_log(), []) self.assertEqual(fake_processutils.fake_execute_get_log(), [])
def test_libvirt_fs_info(self): def test_libvirt_fs_info(self):
image = self.image_class(self.INSTANCE, self.NAME) image = self.image_class(self.INSTANCE, self.NAME)
@ -865,8 +867,10 @@ class LvmTestCase(_ImageTestCase, test.NoDBTestCase):
return return
self.stub_out('os.path.exists', lambda _: True) self.stub_out('os.path.exists', lambda _: True)
self.stubs.Set(image, 'exists', lambda: True) self.stub_out('nova.virt.libvirt.imagebackend.Lvm.exists',
self.stubs.Set(image, 'get_disk_size', lambda _: self.SIZE) lambda *a, **kw: True)
self.stub_out('nova.virt.libvirt.imagebackend.Lvm.get_disk_size',
lambda *a, **kw: self.SIZE)
image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE) image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
@ -1234,8 +1238,10 @@ class EncryptedLvmTestCase(_ImageTestCase, test.NoDBTestCase):
return return
self.stub_out('os.path.exists', lambda _: True) self.stub_out('os.path.exists', lambda _: True)
self.stubs.Set(image, 'exists', lambda: True) self.stub_out('nova.virt.libvirt.imagebackend.Lvm.exists',
self.stubs.Set(image, 'get_disk_size', lambda _: self.SIZE) lambda *a, **kw: True)
self.stub_out('nova.virt.libvirt.imagebackend.Lvm.get_disk_size',
lambda *a, **kw: self.SIZE)
image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE) image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
@ -1415,8 +1421,10 @@ class RbdTestCase(_ImageTestCase, test.NoDBTestCase):
return return
self.stub_out('os.path.exists', lambda _: True) self.stub_out('os.path.exists', lambda _: True)
self.stubs.Set(image, 'exists', lambda: True) self.stub_out('nova.virt.libvirt.imagebackend.Rbd.exists',
self.stubs.Set(image, 'get_disk_size', lambda _: self.SIZE) lambda *a, **kw: True)
self.stub_out('nova.virt.libvirt.imagebackend.Rbd.get_disk_size',
lambda *a, **kw: self.SIZE)
image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE) image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
@ -1726,8 +1734,10 @@ class PloopTestCase(_ImageTestCase, test.NoDBTestCase):
return return
self.stub_out('os.path.exists', lambda _: True) self.stub_out('os.path.exists', lambda _: True)
self.stubs.Set(image, 'exists', lambda: True) self.stub_out('nova.virt.libvirt.imagebackend.Ploop.exists',
self.stubs.Set(image, 'get_disk_size', lambda _: self.SIZE) lambda *a, **kw: True)
self.stub_out('nova.virt.libvirt.imagebackend.Ploop.get_disk_size',
lambda *a, **kw: self.SIZE)
image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE) image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)