Merge lp:~jtran/nova/lp732902 into lp:~hudson-openstack/nova/trunk

[John Tran]

Add a unit test for terminate_instances.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[Vish Ishaya (vishvananda)]

merging this because addtional tests are good and it doesn't touch any actual code

=== modified file 'nova/tests/test_cloud.py'
--- nova/tests/test_cloud.py	2011-03-30 00:07:59 +0000
+++ nova/tests/test_cloud.py	2011-04-05 18:32:32 +0000
@@ -36,6 +36,7 @@
 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
@@ -341,6 +342,19 @@
                 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'])