← Back to branch summary

~hudson-openstack/nova/trunk

« back to all changes in this revision

Viewing changes to nova/tests/test_cloud.py

  • Committer: Tarmac
  • Author(s): John Tran
  • Date: 2011-04-12 07:48:21 UTC
  • mfrom: (922.3.1 lp732902)
  • Revision ID: tarmac-20110412074821-pox2bf2sex8l3niv
Add a unit test for terminate_instances.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_cloud.py
36
36
from nova import service
37
37
from nova import test
38
38
from nova import utils
 
39
from nova import exception
39
40
from nova.auth import manager
40
41
from nova.compute import power_state
41
42
from nova.api.ec2 import cloud
372
373
                LOG.debug(_("Terminating instance %s"), instance_id)
373
374
                rv = self.compute.terminate_instance(instance_id)
374
375
 
 
376
    def test_terminate_instances(self):
 
377
        inst1 = db.instance_create(self.context, {'reservation_id': 'a',
 
378
                                                  'image_id': 1,
 
379
                                                  'host': 'host1'})
 
380
        terminate_instances = self.cloud.terminate_instances
 
381
        # valid instance_id
 
382
        result = terminate_instances(self.context, ['i-00000001'])
 
383
        self.assertTrue(result)
 
384
        # non-existing instance_id
 
385
        self.assertRaises(exception.InstanceNotFound, terminate_instances,
 
386
                          self.context, ['i-2'])
 
387
        db.instance_destroy(self.context, inst1['id'])
 
388
 
375
389
    def test_update_of_instance_display_fields(self):
376
390
        inst = db.instance_create(self.context, {})
377
391
        ec2_id = ec2utils.id_to_ec2_id(inst['id'])