← Back to branch summary

~johannes.erdfelt/nova/lp707224

« back to all changes in this revision

Viewing changes to nova/tests/test_compute.py

  • Committer: Tarmac
  • Author(s): matt.dietz at rackspace, Cerberus
  • Date: 2011-05-17 19:50:43 UTC
  • mfrom: (992.3.8 lp762182)
  • Revision ID: tarmac-20110517195043-a7alz5nckhldx1ed
Fixes improper attribute naming around instance types that broke Resizes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_compute.py
334
334
 
335
335
        self.compute.terminate_instance(self.context, instance_id)
336
336
 
 
337
    def test_finish_resize(self):
 
338
        """Contrived test to ensure finish_resize doesn't raise anything"""
 
339
 
 
340
        def fake(*args, **kwargs):
 
341
            pass
 
342
 
 
343
        self.stubs.Set(self.compute.driver, 'finish_resize', fake)
 
344
        context = self.context.elevated()
 
345
        instance_id = self._create_instance()
 
346
        self.compute.prep_resize(context, instance_id, 1)
 
347
        migration_ref = db.migration_get_by_instance_and_status(context,
 
348
                instance_id, 'pre-migrating')
 
349
        try:
 
350
            self.compute.finish_resize(context, instance_id,
 
351
                    int(migration_ref['id']), {})
 
352
        except KeyError, e:
 
353
            # Only catch key errors. We want other reasons for the test to
 
354
            # fail to actually error out so we don't obscure anything
 
355
            self.fail()
 
356
 
 
357
        self.compute.terminate_instance(self.context, instance_id)
 
358
 
337
359
    def test_resize_instance(self):
338
360
        """Ensure instance can be migrated/resized"""
339
361
        instance_id = self._create_instance()