openstack
/
heat
Code Issues Proposed changes

Fix unit tests for Instance IP 

Don't try to test the IP addresses after the instance has been deleted.

Ref bug #1091497

Change-Id: I566c26a4707edc9d210bd422dcff8fbbcc2236d5
Signed-off-by: Zane Bitter <zbitter@redhat.com>
This commit is contained in:
Zane Bitter 2013-03-01 17:12:54 +01:00
parent 4afe5f3e50
commit a2c2e6798f
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
heat/tests/test_instance.py
View File

@ -80,6 +80,12 @@ class instancesTest(unittest.TestCase):
# this makes sure the auto increment worked on instance creation
self.assertTrue(instance.id > 0)
self.assertEqual(instance.FnGetAtt('PublicIp'), '4.5.6.7')
self.assertEqual(instance.FnGetAtt('PrivateIp'), '4.5.6.7')
self.assertEqual(instance.FnGetAtt('PrivateDnsName'), '4.5.6.7')
self.assertEqual(instance.FnGetAtt('PrivateDnsName'), '4.5.6.7')
self.m.VerifyAll()
def test_instance_create_delete(self):
@ -133,15 +139,6 @@ class instancesTest(unittest.TestCase):
self.assertEqual(instance.state, instance.DELETE_COMPLETE)
self.m.VerifyAll()
private_ip = instance.FnGetAtt('PublicIp')
self.assertEqual(private_ip, '4.5.6.7')
private_ip = instance.FnGetAtt('PrivateIp')
self.assertEqual(private_ip, '4.5.6.7')
private_ip = instance.FnGetAtt('PrivateDnsName')
self.assertEqual(private_ip, '4.5.6.7')
private_ip = instance.FnGetAtt('PrivateDnsName')
self.assertEqual(private_ip, '4.5.6.7')
def test_instance_update_metadata(self):
f = open("%s/WordPress_Single_Instance_gold.template" % self.path)
t = template_format.parse(f.read())