x/gantt
Code Issues Proposed changes

Stupid merge and fixed broken test

Browse Source
This commit is contained in:
matt.dietz@rackspace.com
2011-07-20 12:39:37 -05:00
parent 934932e67c
commit 30ccc2d2e4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nova/tests/test_compute.py
View File

@@ -545,14 +545,14 @@ class ComputeTestCase(test.TestCase):
db.instance_update(self.context, instance_id, {'host': 'foo'})
self.compute.prep_resize(context, instance_id, 3)
self.compute.prep_resize(context, inst_ref['uuid'], 3)
migration_ref = db.migration_get_by_instance_and_status(context,
instance_id, 'pre-migrating')
inst_ref['uuid'], 'pre-migrating')
self.compute.resize_instance(context, instance_id,
self.compute.resize_instance(context, inst_ref['uuid'],
migration_ref['id'])
self.compute.finish_resize(context, instance_id,
self.compute.finish_resize(context, inst_ref['uuid'],
int(migration_ref['id']), {})
# Prove that the instance size is now the new size
@@ -562,9 +562,9 @@ class ComputeTestCase(test.TestCase):
self.assertEqual(instance_type_ref['flavorid'], 3)
# Finally, revert and confirm the old flavor has been applied
self.compute.revert_resize(context, instance_id,
self.compute.revert_resize(context, inst_ref['uuid'],
migration_ref['id'])
self.compute.finish_revert_resize(context, instance_id,
self.compute.finish_revert_resize(context, inst_ref['uuid'],
migration_ref['id'])
inst_ref = db.instance_get(context, instance_id)