summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-02-15 18:20:44 -0600
committerTrey Morris <trey.morris@rackspace.com>2011-02-15 18:20:44 -0600
commit1b9413e11ba1b4b49b50965e3f812e636f2319d5 (patch)
treee0e5135db30ae4f5d42febaab71cbe2d1b4b931f
parent9a8c9d78e5fb7ce67fd6afb9c1eebb49b47abfac (diff)
downloadnova-1b9413e11ba1b4b49b50965e3f812e636f2319d5.tar.gz
nova-1b9413e11ba1b4b49b50965e3f812e636f2319d5.tar.xz
nova-1b9413e11ba1b4b49b50965e3f812e636f2319d5.zip
stubbed out reset networkin xenapi VM tests to solve domid problem
-rw-r--r--nova/tests/test_xenapi.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index d5660c5d1..6b8efc9d8 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -32,6 +32,7 @@ from nova.virt import xenapi_conn
from nova.virt.xenapi import fake as xenapi_fake
from nova.virt.xenapi import volume_utils
from nova.virt.xenapi.vmops import SimpleDH
+from nova.virt.xenapi.vmops import VMOps
from nova.tests.db import fakes as db_fakes
from nova.tests.xenapi import stubs
from nova.tests.glance import stubs as glance_stubs
@@ -141,6 +142,10 @@ class XenAPIVolumeTestCase(test.TestCase):
self.stubs.UnsetAll()
+def reset_network(*args):
+ pass
+
+
class XenAPIVMTestCase(test.TestCase):
"""
Unit tests for VM operations
@@ -162,6 +167,7 @@ class XenAPIVMTestCase(test.TestCase):
stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
stubs.stubout_get_this_vm_uuid(self.stubs)
stubs.stubout_stream_disk(self.stubs)
+ self.stubs.Set(VMOps, 'reset_network', reset_network)
glance_stubs.stubout_glance_client(self.stubs,
glance_stubs.FakeGlance)
self.conn = xenapi_conn.get_connection(False)