This just came up on IRC: in django.test.utils
setup_test_environment() the lines 46/47 are mixed up.

Here's a diff that fixes this issue:

diff --git a/django/test/utils.py b/django/test/utils.py
index a30bb7e..9d39eee 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -43,8 +43,8 @@ def setup_test_environment():
     mail.original_SMTPConnection = mail.SMTPConnection
     mail.SMTPConnection = locmem.EmailBackend

-    settings.EMAIL_BACKEND = 'django.core.mail.backends.locmem'
     mail.original_email_backend = settings.EMAIL_BACKEND
+    settings.EMAIL_BACKEND = 'django.core.mail.backends.locmem'

     mail.outbox = []

Sorry for pasting it here, but it's really just one line :)

Andi


On Tue, Nov 3, 2009 at 6:27 AM, Andi Albrecht
<albrecht.a...@googlemail.com> wrote:
> On Mon, Nov 2, 2009 at 4:53 PM, Jacob Kaplan-Moss <ja...@jacobian.org> wrote:
>>
>> On Mon, Nov 2, 2009 at 10:02 AM, Russell Keith-Magee
>> <freakboy3...@gmail.com> wrote:
>>> A quick reminder - if you have any objections or feedback on #10109,
>>> the M2M refactor [1], I intend to land this patch in approximately 48
>>> hours.
>>
>> I've left a few comments in that thread, but they don't need to be
>> addressed pre-merge. Fire away!
>>
>>> Also, following some mailing list and IRC discussion [2], I'll be
>>> trying to land #10355 at the same time. This is the addition of the
>>> email backend API.
>>
>> I've left a few notes on the ticket. The only one that needs to be
>> addressed pre-merge is a simple design decision, and the final call's
>> yours.
>
> Russel, thanks for finishing the mail backend patch! Jacob's notes on
> the ticket sound very reasonable to me - please let me know which of
> them you'll address before merging. I'd be happy to  provide a patch
> for anything remaining.
>
> Andi
>
>>
>> Thanks!
>>
>> Jacob
>>
>> >>
>>
>

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to 
django-developers+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to