From 9f5273a7d1fc781db7557edd1a4c4af5bb8bedca Mon Sep 17 00:00:00 2001
From: Christine Lytwynec <clytwynec@edx.org>
Date: Mon, 7 Dec 2015 11:50:41 -0500
Subject: [PATCH] pr fixes

---
 common/djangoapps/student/tests/test_auto_auth.py | 4 ++--
 common/djangoapps/student/views.py                | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/djangoapps/student/tests/test_auto_auth.py b/common/djangoapps/student/tests/test_auto_auth.py
index 22a45982b3..be8f233f73 100644
--- a/common/djangoapps/student/tests/test_auto_auth.py
+++ b/common/djangoapps/student/tests/test_auto_auth.py
@@ -194,7 +194,7 @@ class AutoAuthEnabledTestCase(UrlResetMixin, TestCase):
 
         # Check that the redirect was to the course info/outline page
         urls = ('/info', 'course/{}'.format(course_key.to_deprecated_string()))
-        response.url.endswith(urls)  # pylint: disable=no-member
+        self.assertTrue(response.url.endswith(urls))  # pylint: disable=no-member
 
     def test_redirect_to_main(self):
         # Create user and redirect to 'home' (cms) or 'dashboard' (lms)
@@ -206,7 +206,7 @@ class AutoAuthEnabledTestCase(UrlResetMixin, TestCase):
 
         # Check that the redirect was to either /dashboard or /home
         urls = ('/dashboard', '/home')
-        response.url.endswith(urls)  # pylint: disable=no-member
+        self.assertTrue(response.url.endswith(urls))  # pylint: disable=no-member
 
     def _auto_auth(self, params=None, status_code=None, **kwargs):
         """
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 4ccb99f418..516bd20790 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -1824,7 +1824,7 @@ def auto_auth(request):
     if course_id:
         course_key = CourseLocator.from_string(course_id)
     role_names = [v.strip() for v in request.GET.get('roles', '').split(',') if v.strip()]
-    redirect_when_done = request.GET.get('redirect', None)
+    redirect_when_done = request.GET.get('redirect', '').lower() == 'true'
     login_when_done = 'no_login' not in request.GET
 
     form = AccountCreationForm(
@@ -1895,13 +1895,13 @@ def auto_auth(request):
                 # redirect to course info page in LMS
                 redirect_url = reverse(
                     'info',
-                    kwargs={'course_id': unicode(course_id)}
+                    kwargs={'course_id': course_id}
                 )
             except NoReverseMatch:
                 # redirect to course outline page in Studio
                 redirect_url = reverse(
                     'course_handler',
-                    kwargs={'course_key_string': unicode(course_key)}
+                    kwargs={'course_key_string': course_id}
                 )
         else:
             try: