Merge "Don't duplicate PlacementFixture in libvirt func tests"
This commit is contained in:
commit
43afc0443c
|
@ -22,7 +22,6 @@ import mock
|
||||||
from nova import conf
|
from nova import conf
|
||||||
from nova.objects import fields as obj_fields
|
from nova.objects import fields as obj_fields
|
||||||
from nova.tests import fixtures as nova_fixtures
|
from nova.tests import fixtures as nova_fixtures
|
||||||
from nova.tests.functional import fixtures as func_fixtures
|
|
||||||
from nova.tests.functional import test_servers as base
|
from nova.tests.functional import test_servers as base
|
||||||
from nova.tests.unit.virt.libvirt import fake_imagebackend
|
from nova.tests.unit.virt.libvirt import fake_imagebackend
|
||||||
from nova.tests.unit.virt.libvirt import fakelibvirt
|
from nova.tests.unit.virt.libvirt import fakelibvirt
|
||||||
|
@ -50,7 +49,6 @@ class ServersTestBase(base.ServersTestBase):
|
||||||
'nova.virt.libvirt.guest.libvirt',
|
'nova.virt.libvirt.guest.libvirt',
|
||||||
fakelibvirt))
|
fakelibvirt))
|
||||||
self.useFixture(fakelibvirt.FakeLibvirtFixture())
|
self.useFixture(fakelibvirt.FakeLibvirtFixture())
|
||||||
self.useFixture(func_fixtures.PlacementFixture())
|
|
||||||
|
|
||||||
self.useFixture(fixtures.MockPatch(
|
self.useFixture(fixtures.MockPatch(
|
||||||
'nova.virt.libvirt.LibvirtDriver._create_image'))
|
'nova.virt.libvirt.LibvirtDriver._create_image'))
|
||||||
|
|
Loading…
Reference in New Issue