From a4275e90b11405917518d7a30793be2246e10e63 Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Wed, 5 Feb 2014 13:14:19 -0500 Subject: [PATCH] Increase async script timeout in lettuce acceptance tests --- common/djangoapps/terrain/browser.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py index ec676b6daa..18cd6e71ed 100644 --- a/common/djangoapps/terrain/browser.py +++ b/common/djangoapps/terrain/browser.py @@ -41,6 +41,7 @@ LOGGER = getLogger(__name__) LOGGER.info("Loading the lettuce acceptance testing terrain file...") MAX_VALID_BROWSER_ATTEMPTS = 20 +GLOBAL_SCRIPT_TIMEOUT = 20 def get_saucelabs_username_and_key(): @@ -106,7 +107,7 @@ def initial_setup(server): # raise a WebDriverException try: world.browser = Browser(browser_driver) - world.browser.driver.set_script_timeout(10) + world.browser.driver.set_script_timeout(GLOBAL_SCRIPT_TIMEOUT) world.visit('/') except WebDriverException: @@ -133,7 +134,7 @@ def initial_setup(server): **make_saucelabs_desired_capabilities() ) world.absorb(30, 'IMPLICIT_WAIT') - world.browser.set_script_timeout(10) + world.browser.set_script_timeout(GLOBAL_SCRIPT_TIMEOUT) elif world.LETTUCE_SELENIUM_CLIENT == 'grid': world.browser = Browser( @@ -142,7 +143,7 @@ def initial_setup(server): browser=settings.SELENIUM_GRID.get('BROWSER'), ) world.absorb(30, 'IMPLICIT_WAIT') - world.browser.driver.set_script_timeout(10) + world.browser.driver.set_script_timeout(GLOBAL_SCRIPT_TIMEOUT) else: raise Exception("Unknown selenium client '{}'".format(world.LETTUCE_SELENIUM_CLIENT))