openstack
/
horizon
Code Issues Proposed changes

Fix i9n tests pluggable nav structure 

Since JSON converted into Python object contains only dicts and lists,
when searching for leaf-nodes in sidebar nav structure we should treat
lists the same way as tuples. Also remove 'Data Processing' section
from CORE_PAGE_STRUCTURE which hid this issue before with 2 initlal
sahara-dashboard tests.

Change-Id: I5b84fd3b769ae559cea484319b6b8956b80f99ae
Closes-Bug: #1540245
This commit is contained in:
Timur Sufiev 2016-02-01 16:44:24 +03:00
parent e6a6adda4d
commit f93c392586
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openstack_dashboard/test/integration_tests/pages/navigation.py
View File

@ -105,21 +105,6 @@ class Navigation(object):
"Containers",
)
},
"Data Processing":
{
ITEMS:
(
"Clusters",
"Cluster Templates",
"Node Group Templates",
"Job Executions",
"Jobs",
"Job Binaries",
"Data Sources",
"Image Registry",
"Plugins"
),
},
"Orchestration":
{
ITEMS:
@ -321,7 +306,7 @@ class Navigation(object):
if isinstance(items, dict):
for sub_menu, sub_item in six.iteritems(items):
rec(sub_item, sub_menus + (sub_menu,))
elif isinstance(items, tuple):
elif isinstance(items, (list, tuple)):
# exclude ITEMS element from sub_menus
paths = (sub_menus[:-1] + (menu_item,) for menu_item in items)
for path in paths: