Change in vdsm[ovirt-3.5]: tests: clear libvirtconnection cache

Thursday, 16 April 2015

Hello Nir Soffer, Dan Kenigsberg,

I'd like you to do a code review.  Please visit

    https://gerrit.ovirt.org/39948

to review the following change.

Change subject: tests: clear libvirtconnection cache
......................................................................

tests: clear libvirtconnection cache

the libvirtconnection has a cache to reuse connections,
and this caching doesn't play well with the monkeypatching
which we do in tests.

In libvirtconnectionTests, we create fake libvirt objects,
most notably fake virConnect-s. Unfortunately, the test fails
to clean up properly the libvirtconnection cache.

So, the test runs just fine in isolation, but if run in batch
like in 'make check', later tests which expect the real object
become broken.

The failure presents itself like the following:

AttributeError: 'virConnect' object has no attribute 'getMemoryStats'

This patch fixes this error adding a facility to clear
the libvirtconnection cache, and clearing it after each
test.

Change-Id: If4d64920e5f26c276accf26b7a532461d04f02df
Signed-off-by: Francesco Romani <fromani(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/37747
Reviewed-by: Nir Soffer <nsoffer(a)redhat.com&gt;
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M lib/vdsm/libvirtconnection.py
M tests/libvirtconnectionTests.py
2 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/39948/1

diff --git a/lib/vdsm/libvirtconnection.py b/lib/vdsm/libvirtconnection.py
index b1332db..33fdf11 100644
--- a/lib/vdsm/libvirtconnection.py
+++ b/lib/vdsm/libvirtconnection.py
@@ -95,6 +95,14 @@
     return utils.retry(libvirtOpen, timeout=10, sleep=0.2)
 
 
+def _clear():
+    """
+    For clearing connections during the tests.
+    """
+    with __connectionLock:
+        __connections.clear()
+
+
 def get(target=None, killOnFailure=True):
     """Return current connection to libvirt or open a new one.
     Use target to get/create the connection object linked to that object.
diff --git a/tests/libvirtconnectionTests.py b/tests/libvirtconnectionTests.py
index 1ac60a0..18e1984 100644
--- a/tests/libvirtconnectionTests.py
+++ b/tests/libvirtconnectionTests.py
@@ -103,6 +103,10 @@
 
 
 class testLibvirtconnection(TestCaseBase):
+
+    def tearDown(self):
+        libvirtconnection._clear()
+
     @MonkeyPatch(libvirtconnection, 'libvirt', LibvirtMock())
     def testCallSucceeded(self):
         """Positive test - libvirtMock does not raise any
errors"""


-- 
To view, visit https://gerrit.ovirt.org/39948
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4d64920e5f26c276accf26b7a532461d04f02df
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;

    

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011