From 910097ed0b1f7922715bfead98d3be6809fe2479 Mon Sep 17 00:00:00 2001 From: DR695H Date: Wed, 8 May 2019 13:55:32 -0400 Subject: upgrade to python3 libraries basing the code off of robot framework 3.1.1 instead of 3.0, replacing selenium2lib with selnium lib and selenium3, replacing extendedselenium with angularjs lib. Fixing most warnings and all errors from these moves Change-Id: Ifed68c5b8cd28c7bbdc80ee7245860914bdee5b4 Issue-ID: TEST-151 Signed-off-by: DR695H --- robot/resources/browser_setup.robot | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'robot/resources/browser_setup.robot') diff --git a/robot/resources/browser_setup.robot b/robot/resources/browser_setup.robot index 5d34d3de..f9203f31 100644 --- a/robot/resources/browser_setup.robot +++ b/robot/resources/browser_setup.robot @@ -3,7 +3,7 @@ Documentation The main interface for interacting with VID. It handles low le Library Collections Library OSUtils Library OperatingSystem -Library ExtendedSelenium2Library +Library SeleniumLibrary Resource global_properties.robot *** Variables *** @@ -21,8 +21,6 @@ Setup Browser Firefox ${caps}= Evaluate sys.modules['selenium.webdriver'].common.desired_capabilities.DesiredCapabilities.FIREFOX sys Set To Dictionary ${caps} marionette= Set To Dictionary ${caps} elementScrollBehavior 1 - # TODO - # Figure out how to run FF headless without Xvfb ${wd}= Create WebDriver Firefox capabilities=${caps} Set Global Variable ${GLOBAL_SELENIUM_BROWSER_CAPABILITIES} ${caps} @@ -39,9 +37,9 @@ Setup Browser Firefox Handle Proxy Warning [Documentation] Handle Intermediate Warnings from Proxies - ${status} ${data}= Run Keyword And Ignore Error Variable Should Exist \${GLOBAL_PROXY_WARNING_TITLE} + ${status} ${data}= Run Keyword And Ignore Error Variable Should Exist ${GLOBAL_PROXY_WARNING_TITLE} Return From Keyword if '${status}' != 'PASS' - ${status} ${data}= Run Keyword And Ignore Error Variable Should Exist \${GLOBAL_PROXY_WARNING_CONTINUE_XPATH} + ${status} ${data}= Run Keyword And Ignore Error Variable Should Exist ${GLOBAL_PROXY_WARNING_CONTINUE_XPATH} Return From Keyword if '${status}' != 'PASS' Return From Keyword if "${GLOBAL_PROXY_WARNING_TITLE}" == '' Return From Keyword if "${GLOBAL_PROXY_WARNING_CONTINUE_XPATH}" == '' -- cgit 1.2.3-korg