openstack
/
nova
Code Issues Proposed changes

Don't duplicate PlacementFixture in libvirt func tests 

libvirt/base.py inherits from test_servers.ServersTestBase which
itself mixes in _IntegratedTestBase. _IntegratedTestBase starts
the PlacementFixture so we don't need to do so a second time.

If we do, then the things can get very weird during the test
cleanUp period with misleading exception and requests made to
placement when it seems like placement should already be gone
(because the inner fixture has alread been cleaned up, but not
the outer).

Change-Id: I057a07c8d0b880c8d09fc2e618ce1f7fc885beda
This commit is contained in:
Chris Dent 2019-09-09 17:18:27 +01:00
parent b244a02730
commit 5e1b096894
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/functional/libvirt/base.py
View File

@ -22,7 +22,6 @@ import mock
from nova import conf
from nova.objects import fields as obj_fields
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.unit.virt.libvirt import fake_imagebackend
from nova.tests.unit.virt.libvirt import fakelibvirt
@ -50,7 +49,6 @@ class ServersTestBase(base.ServersTestBase):
'nova.virt.libvirt.guest.libvirt',
fakelibvirt))
self.useFixture(fakelibvirt.FakeLibvirtFixture())
self.useFixture(func_fixtures.PlacementFixture())
self.useFixture(fixtures.MockPatch(
'nova.virt.libvirt.LibvirtDriver._create_image'))