Fix issues with EIP unit test

The resource was not being destroyed correctly, but errors were ignored.

Change-Id: I1caa9d092f58f458bd6da46f4cba4ad027b1fd38

diff --git a/heat/tests/test_eip.py b/heat/tests/test_eip.py
index 92570aa2835d2079d4e270e9419c1f4e62d6425b..645684da11ef11715e374b9aaa6d8ca1f1542aff 100644 (file)
--- a/heat/tests/test_eip.py
+++ b/heat/tests/test_eip.py
@@ -82,8 +82,7 @@ class EIPTest(unittest.TestCase):
 
     def test_eip(self):
 
-        eip.ElasticIp.nova().AndReturn(self.fc)
-        eip.ElasticIp.nova().AndReturn(self.fc)
+        eip.ElasticIp.nova().MultipleTimes().AndReturn(self.fc)
 
         self.m.ReplayAll()
 
@@ -91,22 +90,21 @@ class EIPTest(unittest.TestCase):
         stack = self.parse_stack(t)
         resource = self.create_eip(t, stack, 'IPAddress')
 
-        self.assertEqual('11.0.0.1', resource.FnGetRefId())
-        resource.ipaddress = None
-        self.assertEqual('11.0.0.1', resource.FnGetRefId())
+        try:
+            self.assertEqual('11.0.0.1', resource.FnGetRefId())
+            resource.ipaddress = None
+            self.assertEqual('11.0.0.1', resource.FnGetRefId())
 
-        self.assertEqual('1', resource.FnGetAtt('AllocationId'))
+            self.assertEqual('1', resource.FnGetAtt('AllocationId'))
 
-        self.assertEqual(eip.ElasticIp.UPDATE_REPLACE,
-                         resource.handle_update({}))
+            self.assertEqual(eip.ElasticIp.UPDATE_REPLACE,
+                             resource.handle_update({}))
 
-        try:
-            resource.FnGetAtt('Foo')
-            raise Exception('Expected InvalidTemplateAttribute')
-        except eip.exception.InvalidTemplateAttribute:
-            pass
+            self.assertRaises(eip.exception.InvalidTemplateAttribute,
+                              resource.FnGetAtt, 'Foo')
 
-        resource.delete()
+        finally:
+            resource.destroy()
 
         self.m.VerifyAll()