From: Zane Bitter Date: Fri, 1 Mar 2013 16:12:54 +0000 (+0100) Subject: Fix unit tests for Instance IP X-Git-Tag: 2014.1~829 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a2c2e6798fa0f3987d81c663fc1af5ff13392ec5;p=openstack-build%2Fheat-build.git 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 --- diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py index 734478ed..1884a019 100644 --- a/heat/tests/test_instance.py +++ b/heat/tests/test_instance.py @@ -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())