commit 86732f93387ef9561c68b68ad7b92dc31c96b5ae
author Chris Yeoh <cyeoh@au1.ibm.com> Wed Feb 27 20:52:06 2013 +1030
committer Chris Yeoh <cyeoh@au1.ibm.com> Thu Feb 28 09:11:12 2013 +1030
tree eeec7edfd5cc5b6242f1838aadb50e4c82113b40
parent 9a16f19fbddb8d6fe7e00155b6ed0d5829f09c0e

More assertions for test_integration_1

For the boto/test_ec2_instance_run.py test_integration_1 test
add assertions to check that the security group modifications
and public ip association calls actually succeed.

This is to help debug the intermittent bug 1117555 which appears
to be due to the instance sometimes being unreachable via its
public ip.

Change-Id: I8c1ffeee62e1021ecf24f05ac26518ced640c5a1

tempest/tests/boto/test_ec2_instance_run.py

diff --git a/tempest/tests/boto/test_ec2_instance_run.py b/tempest/tests/boto/test_ec2_instance_run.py
index 6b61c11..5c466ac 100644
--- a/tempest/tests/boto/test_ec2_instance_run.py
+++ b/tempest/tests/boto/test_ec2_instance_run.py
@@ -150,16 +150,18 @@
                                                                group_desc)
         self.addResourceCleanUp(self.destroy_security_group_wait,
                                 security_group)
-        self.ec2_client.authorize_security_group(sec_group_name,
-                                                 ip_protocol="icmp",
-                                                 cidr_ip="0.0.0.0/0",
-                                                 from_port=-1,
-                                                 to_port=-1)
-        self.ec2_client.authorize_security_group(sec_group_name,
-                                                 ip_protocol="tcp",
-                                                 cidr_ip="0.0.0.0/0",
-                                                 from_port=22,
-                                                 to_port=22)
+        self.assertTrue(self.ec2_client.authorize_security_group(
+                sec_group_name,
+                ip_protocol="icmp",
+                cidr_ip="0.0.0.0/0",
+                from_port=-1,
+                to_port=-1))
+        self.assertTrue(self.ec2_client.authorize_security_group(
+                sec_group_name,
+                ip_protocol="tcp",
+                cidr_ip="0.0.0.0/0",
+                from_port=22,
+                to_port=22))
         reservation = image_ami.run(kernel_id=self.images["aki"]["image_id"],
                                     ramdisk_id=self.images["ari"]["image_id"],
                                     instance_type=self.instance_type,
@@ -176,7 +178,7 @@
 
         address = self.ec2_client.allocate_address()
         rcuk_a = self.addResourceCleanUp(address.delete)
-        address.associate(instance.id)
+        self.assertTrue(address.associate(instance.id))
 
         rcuk_da = self.addResourceCleanUp(address.disassociate)
         #TODO(afazekas): ping test. dependecy/permission ?