From bf9ac26a06c10bae8c8f8fbe80a5411556b558fc Mon Sep 17 00:00:00 2001
From: Carson Gee <x@carsongee.com>
Date: Mon, 25 Nov 2013 14:17:42 -0500
Subject: [PATCH] Corrected CMS tests so that one is passing, added
 external_auth to cms apps Several pylint fixes and bad super call

---
 cms/envs/common.py                            |  3 +++
 .../external_auth/tests/test_ssl.py           | 27 ++++++++++---------
 common/djangoapps/external_auth/views.py      |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 8e2788a86a..5d0e56a4d1 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -385,6 +385,9 @@ INSTALLED_APPS = (
     'student',  # misleading name due to sharing with lms
     'course_groups',  # not used in cms (yet), but tests run
 
+    # External auth (OpenID, shib, SSL)
+    'external_auth',
+
     # Tracking
     'track',
     'eventtracking.django',
diff --git a/common/djangoapps/external_auth/tests/test_ssl.py b/common/djangoapps/external_auth/tests/test_ssl.py
index f933784d4c..8d6438a41b 100644
--- a/common/djangoapps/external_auth/tests/test_ssl.py
+++ b/common/djangoapps/external_auth/tests/test_ssl.py
@@ -45,7 +45,7 @@ class SSLClientTest(TestCase):
 
     def setUp(self):
         """Setup test case by adding primary user."""
-        super(TestCase, self).setUp()
+        super(SSLClientTest, self).setUp()
         self.client = Client()
         self.factory = RequestFactory()
 
@@ -62,7 +62,7 @@ class SSLClientTest(TestCase):
         # auth should not have a user
         self.assertIn('<form role="form" id="register-form" method="post"', response.content)
         try:
-            eamap_user = ExternalAuthMap.objects.get(external_id=self.USER_EMAIL)
+            ExternalAuthMap.objects.get(external_id=self.USER_EMAIL)
         except ExternalAuthMap.DoesNotExist, ex:
             self.fail('User did not get properly added to external auth map, exception was {0}'.format(str(ex)))
 
@@ -80,10 +80,13 @@ class SSLClientTest(TestCase):
         some point.  using skip here instead of expectFailure because
         of an issue with nose.
         """
-        response = external_auth.views.ssl_login(self._create_ssl_request(reverse('contentstore.views.login_page')))
+        self.client.get(
+            reverse('contentstore.views.login_page'),
+            SSL_CLIENT_S_DN=self.AUTH_DN.format(self.USER_NAME, self.USER_EMAIL)
+        )
 
         try:
-            eamap_user = ExternalAuthMap.objects.get(external_id=self.USER_EMAIL)
+            ExternalAuthMap.objects.get(external_id=self.USER_EMAIL)
         except ExternalAuthMap.DoesNotExist, ex:
             self.fail('User did not get properly added to external auth map, exception was {0}'.format(str(ex)))
 
@@ -98,21 +101,20 @@ class SSLClientTest(TestCase):
         and the user is redirected to slash.
         """
 
-        response = external_auth.views.ssl_login(self._create_ssl_request('/'))
+        external_auth.views.ssl_login(self._create_ssl_request('/'))
 
         # Assert our user exists in both eamap and Users, and that we are logged in
         try:
-            eamap_user = ExternalAuthMap.objects.get(external_id=self.USER_EMAIL)
+            ExternalAuthMap.objects.get(external_id=self.USER_EMAIL)
         except ExternalAuthMap.DoesNotExist, ex:
             self.fail('User did not get properly added to external auth map, exception was {0}'.format(str(ex)))
         try:
-            user = User.objects.get(email=self.USER_EMAIL)
+            User.objects.get(email=self.USER_EMAIL)
         except ExternalAuthMap.DoesNotExist, ex:
             self.fail('User did not get properly added to internal users, exception was {0}'.format(str(ex)))
 
     @unittest.skipUnless(settings.ROOT_URLCONF == 'cms.urls', 'Test only valid in cms')
     @override_settings(MITX_FEATURES=MITX_FEATURES_WITH_SSL_AUTH_IMMEDIATE_SIGNUP)
-    @unittest.skip
     def test_ssl_login_without_signup_cms(self):
         """
         Test IMMEDIATE_SIGNUP feature flag and ensure the user account is
@@ -123,16 +125,17 @@ class SSLClientTest(TestCase):
         of an issue with nose.
         """
 
-        response = external_auth.views.ssl_login(
-            self._create_ssl_request(reverse('contentstore.views.login_page'))
+        self.client.get(
+            reverse('contentstore.views.login_page'),
+            SSL_CLIENT_S_DN=self.AUTH_DN.format(self.USER_NAME, self.USER_EMAIL)
         )
 
         # Assert our user exists in both eamap and Users, and that we are logged in
         try:
-            eamap_user = ExternalAuthMap.objects.get(external_id=self.USER_EMAIL)
+            ExternalAuthMap.objects.get(external_id=self.USER_EMAIL)
         except ExternalAuthMap.DoesNotExist, ex:
             self.fail('User did not get properly added to external auth map, exception was {0}'.format(str(ex)))
         try:
-            user = User.objects.get(email=self.USER_EMAIL)
+            User.objects.get(email=self.USER_EMAIL)
         except ExternalAuthMap.DoesNotExist, ex:
             self.fail('User did not get properly added to internal users, exception was {0}'.format(str(ex)))
diff --git a/common/djangoapps/external_auth/views.py b/common/djangoapps/external_auth/views.py
index 1d34131245..9a57f14345 100644
--- a/common/djangoapps/external_auth/views.py
+++ b/common/djangoapps/external_auth/views.py
@@ -258,7 +258,7 @@ def _signup(request, eamap):
         post_vars = dict(username=username,
                          honor_code=u'true',
                          terms_of_service=u'true')
-        log.info('doing immediate signup for %s, params=%s' % (username, post_vars))
+        log.info('doing immediate signup for %s, params=%s', username, post_vars)
         student.views.create_account(request, post_vars)
         return redirect('/')