Merge pull request #6459 from edx/content-libraries

Content libraries MVP
2015-01-13 11:20:20 -08:00
parent 2b9b531c16 bce8ee692f
commit 6be35e0fc1
132 changed files with 9358 additions and 1409 deletions
--- a/common/djangoapps/student/tests/test_login.py
+++ b/common/djangoapps/student/tests/test_login.py
@@ -482,7 +482,7 @@ class LoginOAuthTokenMixin(object):
        self._setup_user_response(success=True)
        response = self.client.post(self.url, {"access_token": "dummy"})
        self.assertEqual(response.status_code, 204)
-        self.assertEqual(self.client.session['_auth_user_id'], self.user.id)
+        self.assertEqual(self.client.session['_auth_user_id'], self.user.id)  # pylint: disable=no-member

    def test_invalid_token(self):
        self._setup_user_response(success=False)