Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2480 from edx/zoldak/increase_lettuce_script_timeout

Browse Source 
Increase async script timeout in lettuce acceptance tests
This commit is contained in:
Jay Zoldak
2014-02-05 15:45:31 -05:00
parent 544b496185 a4275e90b1
commit 0acb18fe1f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/djangoapps/terrain/browser.py
View File

@@ -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))