From 9dbcf0baa4ee4d2a8e803fd5c876f86e77c28a67 Mon Sep 17 00:00:00 2001 From: Will Daly Date: Tue, 14 May 2013 14:47:50 -0400 Subject: [PATCH] Updated login session handling to fix issue with ChromeDriver on Ubuntu --- common/djangoapps/terrain/course_helpers.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/common/djangoapps/terrain/course_helpers.py b/common/djangoapps/terrain/course_helpers.py index 9d6837ae86..72ea62a1e0 100644 --- a/common/djangoapps/terrain/course_helpers.py +++ b/common/djangoapps/terrain/course_helpers.py @@ -42,6 +42,8 @@ def log_in(username, password): Log the user in programatically ''' + world.browser.visit(django_url('/')) + # Authenticate the user user = authenticate(username=username, password=password) assert(user is not None and user.is_active) @@ -60,15 +62,8 @@ def log_in(username, password): # Retrieve the sessionid and add it to the browser's cookies cookie_dict = {settings.SESSION_COOKIE_NAME: request.session.session_key} - try: - world.browser.cookies.add(cookie_dict) - - # WebDriver has an issue where we cannot set cookies - # before we make a GET request, so if we get an error, - # we load the '/' page and try again - except: - world.browser.visit(django_url('/')) - world.browser.cookies.add(cookie_dict) + world.browser.cookies.delete() + world.browser.cookies.add(cookie_dict) @world.absorb