x/stacklight-integration-tests
Code Issues Proposed changes

Merge "Fix order of ui_driver parameters"

Browse Source
This commit is contained in:
Jenkins 2016-09-19 13:35:19 +00:00 committed by Gerrit Code Review
commit 4eb0555ccc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stacklight_tests/lma_infrastructure_alerting/api.py
View File

@ -107,7 +107,7 @@ class InfraAlertingPluginApi(base_test.PluginApi):
def check_node_in_nagios(self, changed_node, state): def check_node_in_nagios(self, changed_node, state):
with self.ui_tester.ui_driver( with self.ui_tester.ui_driver(
self.get_authenticated_nagios_url(), self.get_authenticated_nagios_url(),
"//frame[2]", "Nagios Core") as driver: "Nagios Core", "//frame[2]") as driver:
driver = self.open_nagios_page( driver = self.open_nagios_page(
driver, 'Hosts', "//table[@class='headertable']") driver, 'Hosts', "//table[@class='headertable']")
asserts.assert_equal(state, self.node_is_present( asserts.assert_equal(state, self.node_is_present(

16
stacklight_tests/toolchain/test_functional.py
View File

@ -300,8 +300,8 @@ class TestFunctionalToolchain(api.ToolchainApi):
lma_devops_node) lma_devops_node)
url = self.LMA_INFRASTRUCTURE_ALERTING.get_authenticated_nagios_url() url = self.LMA_INFRASTRUCTURE_ALERTING.get_authenticated_nagios_url()
with self.ui_tester.ui_driver(url, "//frame[2]", with self.ui_tester.ui_driver(url, "Nagios Core",
"Nagios Core") as driver: "//frame[2]") as driver:
self.LMA_INFRASTRUCTURE_ALERTING.open_nagios_page( self.LMA_INFRASTRUCTURE_ALERTING.open_nagios_page(
driver, 'Services', "//table[@class='headertable']") driver, 'Services', "//table[@class='headertable']")
controller_node = ( controller_node = (
@ -385,8 +385,8 @@ class TestFunctionalToolchain(api.ToolchainApi):
lma_devops_node) lma_devops_node)
url = self.LMA_INFRASTRUCTURE_ALERTING.get_authenticated_nagios_url() url = self.LMA_INFRASTRUCTURE_ALERTING.get_authenticated_nagios_url()
with self.ui_tester.ui_driver(url, "//frame[2]", with self.ui_tester.ui_driver(url, "Nagios Core",
"Nagios Core") as driver: "//frame[2]") as driver:
self.LMA_INFRASTRUCTURE_ALERTING.open_nagios_page( self.LMA_INFRASTRUCTURE_ALERTING.open_nagios_page(
driver, 'Services', "//table[@class='headertable']") driver, 'Services', "//table[@class='headertable']")
controller_nodes = ( controller_nodes = (
@ -483,8 +483,8 @@ class TestFunctionalToolchain(api.ToolchainApi):
self.helpers.cluster_id, ['controller']) self.helpers.cluster_id, ['controller'])
url = self.LMA_INFRASTRUCTURE_ALERTING.get_authenticated_nagios_url() url = self.LMA_INFRASTRUCTURE_ALERTING.get_authenticated_nagios_url()
with self.ui_tester.ui_driver(url, "//frame[2]", with self.ui_tester.ui_driver(url, "Nagios Core",
"Nagios Core") as driver: "//frame[2]") as driver:
self.LMA_INFRASTRUCTURE_ALERTING.open_nagios_page( self.LMA_INFRASTRUCTURE_ALERTING.open_nagios_page(
driver, 'Services', "//table[@class='headertable']") driver, 'Services', "//table[@class='headertable']")
self.change_verify_node_service_state( self.change_verify_node_service_state(
@ -560,8 +560,8 @@ class TestFunctionalToolchain(api.ToolchainApi):
self.helpers.cluster_id, ['controller']) self.helpers.cluster_id, ['controller'])
url = self.LMA_INFRASTRUCTURE_ALERTING.get_authenticated_nagios_url() url = self.LMA_INFRASTRUCTURE_ALERTING.get_authenticated_nagios_url()
with self.ui_tester.ui_driver(url, "//frame[2]", with self.ui_tester.ui_driver(url, "Nagios Core",
"Nagios Core") as driver: "//frame[2]") as driver:
self.LMA_INFRASTRUCTURE_ALERTING.open_nagios_page( self.LMA_INFRASTRUCTURE_ALERTING.open_nagios_page(
driver, 'Services', "//table[@class='headertable']") driver, 'Services', "//table[@class='headertable']")
self.change_verify_node_service_state( self.change_verify_node_service_state(