commit ffdd10f9c692e5a80a08e3771741e2060f43485b
author rabi <ramishra@redhat.com> Wed Mar 29 09:29:56 2017 +0530
committer rabi <ramishra@redhat.com> Wed Apr 05 10:48:43 2017 +0530
tree 18e151e3da5a086123cb440d022d2cd84bff555d
parent fd233f7f16976b0b5aed814f680421fc7f1baf96

Fix format_stack_preview for py3

Also fixes test_res_group_with_nested_template functional
test.

Change-Id: I23fab6b8acc11bb32332dd0042ecd6b8ac289f56

functional/test_preview.py

diff --git a/functional/test_preview.py b/functional/test_preview.py
index 99c24eb..4b9d77c 100644
--- a/functional/test_preview.py
+++ b/functional/test_preview.py
@@ -222,8 +222,16 @@
             stack_name=stack_name,
             template=main_template,
             files={'nested.yaml': nested_template}).to_dict()
+
+        resource_names = []
+
+        def get_resource_names(resources):
+            for item in resources:
+                if isinstance(item, dict):
+                    resource_names.append(item['resource_name'])
+                else:
+                    get_resource_names(item)
+        get_resource_names(result['resources'])
         # ensure that fixed network and port here
-        self.assertEqual('fixed_network',
-                         result['resources'][0]['resource_name'])
-        self.assertEqual('port',
-                         result['resources'][1][0][0]['resource_name'])
+        self.assertIn('fixed_network', resource_names)
+        self.assertIn('port', resource_names)