Ticket #17940: 17940.patch

django/contrib/auth/tests/views.py

@@ -12 +12 @@
 from django.utils.encoding import force_unicode
 from django.utils.html import escape
 from django.test import TestCase
+from django.test.utils import override_settings
 
 from django.contrib.auth import SESSION_KEY, REDIRECT_FIELD_NAME
 from django.contrib.auth.forms import (AuthenticationForm, PasswordChangeForm,
@@ -52 +53 @@
     def assertContainsEscaped(self, response, text, **kwargs):
         return self.assertContains(response, escape(force_unicode(text)), **kwargs)
 
+AuthViewsTestCase = override_settings(USE_TZ=False)(AuthViewsTestCase)
 
+
 class AuthViewNamedURLTests(AuthViewsTestCase):
     urls = 'django.contrib.auth.urls'
 

django/contrib/auth/tests/signals.py

@@ -1 +1 @@
 from django.test import TestCase
+from django.test.utils import override_settings
 from django.contrib.auth import signals
 
 
@@ -45 +46 @@
         self.client.get('/logout/next_page/')
         self.assertEqual(len(self.logged_out), 1)
         self.assertEqual(self.logged_out[0].username, 'testclient')
+
+SignalTestCase = override_settings(USE_TZ=False)(SignalTestCase)

django/contrib/auth/tests/context_processors.py

@@ -7 +7 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 
-
 class AuthContextProcessorTests(TestCase):
     """
     Tests for the ``django.contrib.auth.context_processors.auth`` processor
@@ -97 +96 @@
         self.assertEqual(user, response.context['user'])
 
 AuthContextProcessorTests = override_settings(
-    TEMPLATE_DIRS = (
+    TEMPLATE_DIRS=(
             os.path.join(os.path.dirname(__file__), 'templates'),
-        )
+        ),
+    USE_TZ=False,                           # required for loading the fixture
 )(AuthContextProcessorTests)

django/contrib/auth/tests/models.py

@@ -1 +1 @@
 from django.conf import settings
 from django.test import TestCase
+from django.test.utils import override_settings
 from django.contrib.auth.models import (Group, User,
     SiteProfileNotAvailable, UserManager)
 
@@ -37 +38 @@
         settings.AUTH_PROFILE_MODULE = 'foo.bar'
         self.assertRaises(SiteProfileNotAvailable, user.get_profile)
 
+ProfileTestCase = override_settings(USE_TZ=False)(ProfileTestCase)
 
+
 class NaturalKeysTestCase(TestCase):
     fixtures = ['authtestdata.json']
 
@@ -50 +53 @@
         users_group = Group.objects.create(name='users')
         self.assertEquals(Group.objects.get_by_natural_key('users'), users_group)
 
+NaturalKeysTestCase = override_settings(USE_TZ=False)(NaturalKeysTestCase)
 
+
 class LoadDataWithoutNaturalKeysTestCase(TestCase):
     fixtures = ['regular.json']
 
@@ -59 +64 @@
         group = Group.objects.get(name='my_group')
         self.assertEquals(group, user.groups.get())
 
+LoadDataWithoutNaturalKeysTestCase = override_settings(USE_TZ=False)(LoadDataWithoutNaturalKeysTestCase)
 
+
 class LoadDataWithNaturalKeysTestCase(TestCase):
     fixtures = ['natural.json']
 
@@ -68 +75 @@
         group = Group.objects.get(name='my_group')
         self.assertEquals(group, user.groups.get())
 
+LoadDataWithNaturalKeysTestCase = override_settings(USE_TZ=False)(LoadDataWithNaturalKeysTestCase)
 
+
 class UserManagerTestCase(TestCase):
 
     def test_create_user(self):

django/contrib/auth/tests/forms.py

@@ -5 +5 @@
 from django.contrib.auth.models import User
 from django.contrib.auth.forms import UserCreationForm, AuthenticationForm,  PasswordChangeForm, SetPasswordForm, UserChangeForm, PasswordResetForm
 from django.test import TestCase
+from django.test.utils import override_settings
 from django.utils.encoding import force_unicode
 from django.utils import translation
 
@@ -74 +75 @@
         u = form.save()
         self.assertEqual(repr(u), '<User: jsmith@example.com>')
 
+UserCreationFormTest = override_settings(USE_TZ=False)(UserCreationFormTest)
 
+
 class AuthenticationFormTest(TestCase):
 
     fixtures = ['authtestdata.json']
@@ -125 +128 @@
         self.assertTrue(form.is_valid())
         self.assertEqual(form.non_field_errors(), [])
 
+AuthenticationFormTest = override_settings(USE_TZ=False)(AuthenticationFormTest)
 
+
 class SetPasswordFormTest(TestCase):
 
     fixtures = ['authtestdata.json']
@@ -151 +156 @@
         form = SetPasswordForm(user, data)
         self.assertTrue(form.is_valid())
 
+SetPasswordFormTest = override_settings(USE_TZ=False)(SetPasswordFormTest)
 
+
 class PasswordChangeFormTest(TestCase):
 
     fixtures = ['authtestdata.json']
@@ -198 +205 @@
         self.assertEqual(PasswordChangeForm(user, {}).fields.keys(),
                          ['old_password', 'new_password1', 'new_password2'])
 
+PasswordChangeFormTest = override_settings(USE_TZ=False)(PasswordChangeFormTest)
 
+
 class UserChangeFormTest(TestCase):
 
     fixtures = ['authtestdata.json']
@@ -226 +235 @@
         # Just check we can create it
         form = MyUserForm({})
 
+UserChangeFormTest = override_settings(USE_TZ=False)(UserChangeFormTest)
 
+
 class PasswordResetFormTest(TestCase):
 
     fixtures = ['authtestdata.json']
@@ -304 +315 @@
         self.assertFalse(form.is_valid())
         self.assertEqual(form["email"].errors,
                          [u"The user account associated with this e-mail address cannot reset the password."])
+
+PasswordResetFormTest = override_settings(USE_TZ=False)(PasswordResetFormTest)