openstack/nova
Code Issues Proposed changes

Fix bad test cases in smoketest.

Browse Source 
Fixes bug #912650.

Fixes the following test cases in
smoketests/test_netadmin.py:SecurityGroupTests:
    'test_004_can_access_metadata_over_public_ip'
    'test_005_validate_metadata'
    'test_999_tearDown'

Change-Id: Iefa8034a364e13243d06200e8af1840df896baf3
This commit is contained in:
Hengqing Hu
2012-01-09 17:03:15 +08:00
parent 6fdbf6ce7f
commit c33bd50a79
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
smoketests/test_netadmin.py
View File

@@ -161,20 +161,23 @@ class SecurityGroupTests(base.UserSmokeTestCase):
result = self.conn.associate_address(self.data['instance'].id, result = self.conn.associate_address(self.data['instance'].id,
self.data['public_ip']) self.data['public_ip'])
start_time = time.time() start_time = time.time()
try: while not self.__public_instance_is_accessible():
while not self.__public_instance_is_accessible(): # 1 minute to launch
# 1 minute to launch if time.time() - start_time > 60:
if time.time() - start_time > 60: raise Exception("Timeout")
raise Exception("Timeout") time.sleep(1)
time.sleep(1)
finally:
result = self.conn.disassociate_address(self.data['public_ip'])
def test_005_validate_metadata(self): def test_005_validate_metadata(self):
instance = self.data['instance'] instance = self.data['instance']
self.assertTrue(instance.instance_type, start_time = time.time()
self.__get_metadata_item("instance-type")) instance_type = False
while not instance_type:
instance_type = self.__get_metadata_item('instance-type')
# 10 seconds to restart proxy
if time.time() - start_time > 10:
raise Exception("Timeout")
time.sleep(1)
self.assertEqual(instance.instance_type, instance_type)
#FIXME(dprince): validate more metadata here #FIXME(dprince): validate more metadata here
def test_006_can_revoke_security_group_ingress(self): def test_006_can_revoke_security_group_ingress(self):
@@ -190,6 +193,7 @@ class SecurityGroupTests(base.UserSmokeTestCase):
time.sleep(1) time.sleep(1)
def test_999_tearDown(self): def test_999_tearDown(self):
self.conn.disassociate_address(self.data['public_ip'])
self.conn.delete_key_pair(TEST_KEY) self.conn.delete_key_pair(TEST_KEY)
self.conn.delete_security_group(TEST_GROUP) self.conn.delete_security_group(TEST_GROUP)
groups = self.conn.get_all_security_groups() groups = self.conn.get_all_security_groups()