From 79fcc65491052adf50ffe141997c28b658a0461b Mon Sep 17 00:00:00 2001 From: Sergei Chipiga Date: Fri, 22 Apr 2016 13:00:16 +0300 Subject: [PATCH] Fix pre_test_hook fail and sidebar menu fail It fixes two small but important bugs: - remove apache restart, because it fails pre_test_hook, which fails test build (the latter implication was introduced recently in a devstack-gate scripts); - fix sidebar menu item click before prev item was collapsed, because in this case menu item won't be expanded (supposedly a result of recent update of one of XStatic dependencies). Change-Id: If463c4c8b16b54f033e2a2ee33ba995ca7844f2b Closes-Bug: #1573726 --- openstack_dashboard/test/integration_tests/regions/menus.py | 3 ++- tools/gate/integration/pre_test_hook.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openstack_dashboard/test/integration_tests/regions/menus.py b/openstack_dashboard/test/integration_tests/regions/menus.py index a78085937a..1dd0746fd1 100644 --- a/openstack_dashboard/test/integration_tests/regions/menus.py +++ b/openstack_dashboard/test/integration_tests/regions/menus.py @@ -123,7 +123,8 @@ class NavigationAccordionRegion(baseregion.BaseRegion): # it. Otherwise selenium will complain with # MoveTargetOutOfBoundsException selected_item.click() - self._wait_until_transition_ends(selected_item) + self._wait_until_transition_ends( + self._get_menu_list_next_to_menu_title(selected_item)) else: is_already_within_required_item = True diff --git a/tools/gate/integration/pre_test_hook.sh b/tools/gate/integration/pre_test_hook.sh index 77da055d10..9699c005a9 100755 --- a/tools/gate/integration/pre_test_hook.sh +++ b/tools/gate/integration/pre_test_hook.sh @@ -6,4 +6,3 @@ set -x cd /opt/stack/new/horizon/openstack_dashboard/local/local_settings.d mv _20_integration_tests_scaffolds.py.example _20_integration_tests_scaffolds.py -sudo service apache2 restart