Merge pull request #9364 from edx/ned/django-1-4-22

Upgrade Django to 1.4.22

common/djangoapps/microsite_configuration/tests/test_middleware.py

@@ -10,6 +10,8 @@ from django.test.client import Client
 from django.test.utils import override_settings
 import unittest
 
+from student.tests.factories import UserFactory
+
 
 # NOTE: We set SESSION_SAVE_EVERY_REQUEST to True in order to make sure
 # Sessions are always started on every request
@@ -22,8 +24,13 @@ class MicroSiteSessionCookieTests(TestCase):
 
     def setUp(self):
         super(MicroSiteSessionCookieTests, self).setUp()
-        # create a test client
+        # Create a test client, and log it in so that it will save some session
+        # data.
+        self.user = UserFactory.create()
+        self.user.set_password('password')
+        self.user.save()
         self.client = Client()
+        self.client.login(username=self.user.username, password="password")
 
     def test_session_cookie_domain_no_microsite(self):
         """

requirements/edx/base.txt

@@ -34,7 +34,7 @@ django-storages==1.1.5
 django-threaded-multihost==1.4-1
 django-method-override==0.1.0
 djangorestframework==2.3.14
-django==1.4.21
+django==1.4.22
 elasticsearch==0.4.5
 facebook-sdk==0.4.0
 feedparser==5.1.3