summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorCory Wright <cory.wright@rackspace.com>2011-03-08 14:35:53 +0000
committerCory Wright <cory.wright@rackspace.com>2011-03-08 14:35:53 +0000
commitb8a0fdca4df454a4d60df40d06ebd82bcc2ba3da (patch)
tree80d2f054ac3c8ecf93541d598c71d89e22ea048f /nova/tests
parent4937a1ec17beadb6e1737ac126adf68fd6dbf2c8 (diff)
downloadnova-b8a0fdca4df454a4d60df40d06ebd82bcc2ba3da.tar.gz
nova-b8a0fdca4df454a4d60df40d06ebd82bcc2ba3da.tar.xz
nova-b8a0fdca4df454a4d60df40d06ebd82bcc2ba3da.zip
* pep8 cleanups in migrations
* a few bugfixes
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_xenapi.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 27f0e5dd7..25070e108 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -251,7 +251,7 @@ class XenAPIVMTestCase(test.TestCase):
self.vm_info = vm_info
self.vm = vm
- def check_vm_record(self):
+ def check_vm_record(self, conn):
# Check that m1.large above turned into the right thing.
instance_type = db.instance_type_get_by_name(conn, 'm1.large')
mem_kib = long(instance_type['memory_mb']) << 10
@@ -321,7 +321,7 @@ class XenAPIVMTestCase(test.TestCase):
instance = db.instance_create(values)
conn.spawn(instance)
self.create_vm_record(conn, os_type)
- self.check_vm_record()
+ self.check_vm_record(conn)
def test_spawn_not_enough_memory(self):
FLAGS.xenapi_image_service = 'glance'