merge the trunks

2011-09-16 13:48:52 -05:00
parent 73a0312626 1d7f7273ac
commit cee5f38fa2
1 changed files with 10 additions and 1 deletions
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -52,6 +52,15 @@ def _concurrency(wait, done, target):
    done.send()


+class FakeVirDomainSnapshot(object):
+
+    def __init__(self, dom=None):
+        self.dom = dom
+
+    def delete(self, flags):
+        pass
+
+
 class FakeVirtDomain(object):

    def __init__(self, fake_xml=None):
@@ -69,7 +78,7 @@ class FakeVirtDomain(object):
            """

    def snapshotCreateXML(self, *args):
-        return None
+        return FakeVirDomainSnapshot(self)

    def createWithFlags(self, launch_flags):
        pass