Ticket #17945: django-tests.patch

File django-tests.patch, 2.6 KB (added by andrey@…, 7 years ago)

patch

  • django/contrib/auth/tests/forms.py

    diff --git a/django/contrib/auth/tests/forms.py b/django/contrib/auth/tests/forms.py
    index 2bacc8e..b65f3fc 100644
    a b class PasswordResetFormTest(TestCase): 
    303303        form = PasswordResetForm(data)
    304304        self.assertFalse(form.is_valid())
    305305        self.assertEqual(form["email"].errors,
    306                          [u"The user account associated with this e-mail address cannot reset the password."])
     306                         [PasswordResetForm.error_messages['unusable']])
  • django/contrib/auth/tests/views.py

    diff --git a/django/contrib/auth/tests/views.py b/django/contrib/auth/tests/views.py
    index 1975266..2ffa8d5 100644
    a b from django.core.urlresolvers import reverse, NoReverseMatch 
    1111from django.http import QueryDict
    1212from django.utils.encoding import force_unicode
    1313from django.utils.html import escape
     14from django.template import loader
    1415from django.test import TestCase
    1516
    1617from django.contrib.auth import SESSION_KEY, REDIRECT_FIELD_NAME
    class AuthViewsTestCase(TestCase): 
    3435        settings.TEMPLATE_DIRS = (
    3536            os.path.join(os.path.dirname(__file__), 'templates'),
    3637        )
     38        self.old_TEMPLATE_LOADERS = settings.TEMPLATE_LOADERS
     39        settings.TEMPLATE_LOADERS = ('django.template.loaders.filesystem.Loader',
     40                                     'django.template.loaders.app_directories.Loader')
     41        loader.template_source_loaders = None #Flushing loader cache
    3742
    3843    def tearDown(self):
    3944        settings.LANGUAGES = self.old_LANGUAGES
    4045        settings.LANGUAGE_CODE = self.old_LANGUAGE_CODE
    4146        settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS
     47        settings.TEMPLATE_LOADERS = self.old_TEMPLATE_LOADERS
     48        loader.template_source_loaders = None #Flushing loader cache
    4249
    4350    def login(self, password='password'):
    4451        response = self.client.post('/login/', {
  • django/core/management/base.py

    diff --git a/django/core/management/base.py b/django/core/management/base.py
    index db855e1..a9fc38c 100644
    a b class BaseCommand(object): 
    247247            else:
    248248                self.stderr.write(smart_str(self.style.ERROR('Error: %s\n' % e)))
    249249            sys.exit(1)
    250         if saved_lang is not None:
    251             translation.activate(saved_lang)
     250        finally:
     251            if saved_lang is not None:
     252                translation.activate(saved_lang)
    252253
    253254    def validate(self, app=None, display_num_errors=False):
    254255        """
Back to Top