diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-01-04 12:05:04 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-01-04 12:05:04 +0000 |
| commit | e07560a88e2bc1f5be2aabec25eca950259f7266 (patch) | |
| tree | 993698b699611434f8503d3fd4aea27fa645c5c1 /tests | |
| parent | 89ded975fe1ff75b5b2456f4ee7e1256a261108e (diff) | |
Modified the way EMAIL_BACKEND is specified to make it consistent with the new "use the class name" policy for backends.
This is a BACKWARDS-INCOMPATIBLE CHANGE for anyone using a manually
specified EMAIL_BACKEND setting. If you have manually specified
EMAIL_BACKEND, you will need to append ".EmailBackend" to your
existing EMAIL_BACKEND setting. See the django-dev mailing list for
details.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12084 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/regressiontests/mail/tests.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/regressiontests/mail/tests.py b/tests/regressiontests/mail/tests.py index 10d2ae7df3..79aff35694 100644 --- a/tests/regressiontests/mail/tests.py +++ b/tests/regressiontests/mail/tests.py @@ -174,7 +174,7 @@ Content # Test that the console backend can be pointed at an arbitrary stream >>> s = StringIO() ->>> connection = mail.get_connection('django.core.mail.backends.console', stream=s) +>>> connection = mail.get_connection('django.core.mail.backends.console.EmailBackend', stream=s) >>> send_mail('Subject', 'Content', 'from@example.com', ['to@example.com'], connection=connection) 1 >>> print s.getvalue() @@ -270,7 +270,7 @@ Content True # Test custom backend defined in this suite. ->>> conn = mail.get_connection('regressiontests.mail.custombackend') +>>> conn = mail.get_connection('regressiontests.mail.custombackend.EmailBackend') >>> hasattr(conn, 'test_outbox') True >>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'}) @@ -280,23 +280,23 @@ True 1 # Test backend argument of mail.get_connection() ->>> isinstance(mail.get_connection('django.core.mail.backends.smtp'), smtp.EmailBackend) +>>> isinstance(mail.get_connection('django.core.mail.backends.smtp.EmailBackend'), smtp.EmailBackend) True ->>> isinstance(mail.get_connection('django.core.mail.backends.locmem'), locmem.EmailBackend) +>>> isinstance(mail.get_connection('django.core.mail.backends.locmem.EmailBackend'), locmem.EmailBackend) True ->>> isinstance(mail.get_connection('django.core.mail.backends.dummy'), dummy.EmailBackend) +>>> isinstance(mail.get_connection('django.core.mail.backends.dummy.EmailBackend'), dummy.EmailBackend) True ->>> isinstance(mail.get_connection('django.core.mail.backends.console'), console.EmailBackend) +>>> isinstance(mail.get_connection('django.core.mail.backends.console.EmailBackend'), console.EmailBackend) True >>> tmp_dir = tempfile.mkdtemp() ->>> isinstance(mail.get_connection('django.core.mail.backends.filebased', file_path=tmp_dir), filebased.EmailBackend) +>>> isinstance(mail.get_connection('django.core.mail.backends.filebased.EmailBackend', file_path=tmp_dir), filebased.EmailBackend) True >>> shutil.rmtree(tmp_dir) >>> isinstance(mail.get_connection(), locmem.EmailBackend) True # Test connection argument of send_mail() et al ->>> connection = mail.get_connection('django.core.mail.backends.console') +>>> connection = mail.get_connection('django.core.mail.backends.console.EmailBackend') >>> send_mail('Subject', 'Content', 'from@example.com', ['to@example.com'], connection=connection) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 |