From 115727a7cd41e703b35b6b061b64d097b9bbbf1d Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Mon, 18 Jul 2011 17:58:33 -0500
Subject: Fixed the broken tests again

---
 nova/compute/manager.py    | 5 ++---
 nova/tests/test_compute.py | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 1feb96faa..595e2e334 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -770,9 +770,8 @@ class ComputeManager(manager.SchedulerDependentManager):
                 instance_ref['host'])
         rpc.cast(context, topic,
                 {'method': 'resize_instance',
-                 'args': { 'instance_id': instance_ref['uuid'],
-                           'migration_id': migration_ref['id']},
-                })
+                 'args': {'instance_id': instance_ref['uuid'],
+                          'migration_id': migration_ref['id']}})
         usage_info = utils.usage_from_instance(instance_ref,
                               new_instance_type=instance_type['name'],
                               new_instance_type_id=instance_type['id'])
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 0586cc40d..a4adaee17 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -429,7 +429,8 @@ class ComputeTestCase(test.TestCase):
         migration_ref = db.migration_get_by_instance_and_status(context,
                 instance_ref['uuid'], 'pre-migrating')
         try:
-            self.compute.finish_resize(context, int(migration_ref['id']), {})
+            self.compute.finish_resize(context, instance_ref['uuid'],
+                    int(migration_ref['id']), {})
         except KeyError, e:
             # Only catch key errors. We want other reasons for the test to
             # fail to actually error out so we don't obscure anything
@@ -480,7 +481,8 @@ class ComputeTestCase(test.TestCase):
         self.compute.prep_resize(context, inst_ref['uuid'], 1)
         migration_ref = db.migration_get_by_instance_and_status(context,
                 inst_ref['uuid'], 'pre-migrating')
-        self.compute.resize_instance(context, migration_ref['id'])
+        self.compute.resize_instance(context, inst_ref['uuid'],
+                migration_ref['id'])
         self.compute.terminate_instance(context, instance_id)
 
     def test_resize_invalid_flavor_fails(self):
-- 
cgit