Merge "Ignore ValueError when adding dependencies" into stable/kilo

2 files changed, 20 insertions, 1 deletions

diff --git a/heat/engine/stack.py b/heat/engine/stack.py
index 225dbbdee..98d449851 100755
--- a/heat/engine/stack.py
+++ b/heat/engine/stack.py
@@ -329,7 +329,10 @@ class Stack(collections.Mapping):
         '''Return the dependency graph for a list of resources.'''
         deps = dependencies.Dependencies()
         for res in resources:
-            res.add_dependencies(deps)
+            try:
+                res.add_dependencies(deps)
+            except ValueError:
+                pass
 
         return deps
 
diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py
index ab4052caf..8ed38ed20 100644
--- a/heat/tests/test_resource.py
+++ b/heat/tests/test_resource.py
@@ -1282,6 +1282,22 @@ class ResourceDependenciesTest(common.HeatTestCase):
 
         self.assertIn(res, graph)
 
+    def test_hot_add_dep_error(self):
+        tmpl = template.Template({
+            'heat_template_version': '2013-05-23',
+            'resources': {
+                'foo': {'type': 'GenericResourceType'},
+                'bar': {'type': 'ResourceWithPropsType'}
+            }
+        })
+        stack = parser.Stack(utils.dummy_context(), 'test', tmpl)
+        res = stack['bar']
+        self.patchobject(res, 'add_dependencies',
+                         side_effect=ValueError)
+        graph = stack.dependencies.graph()
+        self.assertNotIn(res, graph)
+        self.assertIn(stack['foo'], graph)
+
     def test_ref(self):
         tmpl = template.Template({
             'HeatTemplateFormatVersion': '2012-12-12',