summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJulien Danjou <julien.danjou@enovance.com>2011-12-14 11:38:42 +0100
committerJulien Danjou <julien.danjou@enovance.com>2011-12-15 12:19:39 +0100
commited3b282793ca1675820ff344720cee0c5c8c19ab (patch)
tree37701a7565f4e7653ba0a05009fc57888b852241 /nova/tests
parent076317047802d3ed393c5467223abd6f613291ba (diff)
Make libvirt_uri a property
Change-Id: Ib7694780fb979476b46776656f58526d0c04ec59 Signed-off-by: Julien Danjou <julien.danjou@enovance.com>
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_libvirt.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 61524e0cb..438b7c4fb 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -555,8 +555,7 @@ class LibvirtConnTestCase(test.TestCase):
self.flags(libvirt_type='lxc')
conn = connection.LibvirtConnection(True)
- uri = conn.get_uri()
- self.assertEquals(uri, 'lxc:///')
+ self.assertEquals(conn.libvirt_uri, 'lxc:///')
network_info = _fake_network_info(self.stubs, 1)
xml = conn.to_xml(instance_ref, network_info)
@@ -687,8 +686,7 @@ class LibvirtConnTestCase(test.TestCase):
self.flags(libvirt_type=libvirt_type)
conn = connection.LibvirtConnection(True)
- uri = conn.get_uri()
- self.assertEquals(uri, expected_uri)
+ self.assertEquals(conn.libvirt_uri, expected_uri)
network_info = _fake_network_info(self.stubs, 1)
xml = conn.to_xml(instance_ref, network_info, rescue)
@@ -716,8 +714,7 @@ class LibvirtConnTestCase(test.TestCase):
for (libvirt_type, (expected_uri, checks)) in type_uri_map.iteritems():
self.flags(libvirt_type=libvirt_type)
conn = connection.LibvirtConnection(True)
- uri = conn.get_uri()
- self.assertEquals(uri, testuri)
+ self.assertEquals(conn.libvirt_uri, testuri)
db.instance_destroy(user_context, instance_ref['id'])
def test_update_available_resource_works_correctly(self):