From 5e1b096894f6de4cfbca254cf74dcfcf56358ea5 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Mon, 9 Sep 2019 17:18:27 +0100 Subject: [PATCH] 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 --- nova/tests/functional/libvirt/base.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/nova/tests/functional/libvirt/base.py b/nova/tests/functional/libvirt/base.py index 0b2cb9fadf77..e6cc585d4feb 100644 --- a/nova/tests/functional/libvirt/base.py +++ b/nova/tests/functional/libvirt/base.py @@ -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'))