diff options
author | John Tran <jtran@attinteractive.com> | 2011-04-12 07:48:21 +0000 |
---|---|---|
committer | Tarmac <> | 2011-04-12 07:48:21 +0000 |
commit | 8b54c186a7475cb800ac0de81be3478bc795d095 (patch) | |
tree | 002933edd6ae28462c8d868cc7fd0f8c89eccaea | |
parent | 0f7ea0f97a6079058d90516bf306a002ac7757e7 (diff) | |
parent | b54b6c200092054e38af1fa1e5885fe915e53149 (diff) | |
download | nova-8b54c186a7475cb800ac0de81be3478bc795d095.tar.gz nova-8b54c186a7475cb800ac0de81be3478bc795d095.tar.xz nova-8b54c186a7475cb800ac0de81be3478bc795d095.zip |
Add a unit test for terminate_instances.
-rw-r--r-- | nova/tests/test_cloud.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py index 5f76a9005..c45bdd12c 100644 --- a/nova/tests/test_cloud.py +++ b/nova/tests/test_cloud.py @@ -36,6 +36,7 @@ from nova import rpc from nova import service from nova import test from nova import utils +from nova import exception from nova.auth import manager from nova.compute import power_state from nova.api.ec2 import cloud @@ -372,6 +373,19 @@ class CloudTestCase(test.TestCase): LOG.debug(_("Terminating instance %s"), instance_id) rv = self.compute.terminate_instance(instance_id) + def test_terminate_instances(self): + inst1 = db.instance_create(self.context, {'reservation_id': 'a', + 'image_id': 1, + 'host': 'host1'}) + terminate_instances = self.cloud.terminate_instances + # valid instance_id + result = terminate_instances(self.context, ['i-00000001']) + self.assertTrue(result) + # non-existing instance_id + self.assertRaises(exception.InstanceNotFound, terminate_instances, + self.context, ['i-2']) + db.instance_destroy(self.context, inst1['id']) + def test_update_of_instance_display_fields(self): inst = db.instance_create(self.context, {}) ec2_id = ec2utils.id_to_ec2_id(inst['id']) |