Merge "Fix format_stack_preview for py3"
This commit is contained in:
commit
b5359cedf1
@ -367,7 +367,7 @@ def format_stack_resource(resource, detail=True, with_props=False,
|
|||||||
def format_stack_preview(stack):
|
def format_stack_preview(stack):
|
||||||
def format_resource(res):
|
def format_resource(res):
|
||||||
if isinstance(res, list):
|
if isinstance(res, list):
|
||||||
return map(format_resource, res)
|
return list(map(format_resource, res))
|
||||||
return format_stack_resource(res, with_props=True)
|
return format_stack_resource(res, with_props=True)
|
||||||
|
|
||||||
fmt_stack = format_stack(stack, preview=True)
|
fmt_stack = format_stack(stack, preview=True)
|
||||||
|
@ -222,8 +222,16 @@ resources:
|
|||||||
stack_name=stack_name,
|
stack_name=stack_name,
|
||||||
template=main_template,
|
template=main_template,
|
||||||
files={'nested.yaml': nested_template}).to_dict()
|
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
|
# ensure that fixed network and port here
|
||||||
self.assertEqual('fixed_network',
|
self.assertIn('fixed_network', resource_names)
|
||||||
result['resources'][0]['resource_name'])
|
self.assertIn('port', resource_names)
|
||||||
self.assertEqual('port',
|
|
||||||
result['resources'][1][0][0]['resource_name'])
|
|
||||||
|
Loading…
Reference in New Issue
Block a user