From 60862d85175bf78b3dce5e20a200a8daece0b7a4 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 15 Feb 2013 15:36:57 +0000 Subject: [PATCH] Ensure there is only one instance of LibvirtDriver The HostState() class in libvirt creates a second instance of the LibvirtDriver() class, which cause duplicate initialization of various things. This is pointless, since it was a method on the original LibvirtDriver() which created the HostState() instance, and thus it could easily pass in the original object. Blueprint: compute-driver-events Change-Id: I0734bfcc1b014406ffe64ef7abb14a533998dea2 Signed-off-by: Daniel P. Berrange --- nova/tests/test_libvirt.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index c93bb016..d2cd5a75 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -3393,13 +3393,7 @@ class HostStateTestCase(test.TestCase): return HostStateTestCase.instance_caps def test_update_status(self): - virtapi = fake.FakeVirtAPI() - self.mox.StubOutWithMock(libvirt_driver, 'LibvirtDriver') - libvirt_driver.LibvirtDriver(virtapi, True).AndReturn( - self.FakeConnection()) - - self.mox.ReplayAll() - hs = libvirt_driver.HostState(virtapi, True) + hs = libvirt_driver.HostState(self.FakeConnection()) stats = hs._stats self.assertEquals(stats["vcpus"], 1) self.assertEquals(stats["vcpus_used"], 0)