diff options
| author | Kevin Kubasik <kevin@kubasik.net> | 2009-08-04 09:30:09 +0000 |
|---|---|---|
| committer | Kevin Kubasik <kevin@kubasik.net> | 2009-08-04 09:30:09 +0000 |
| commit | e2d14c075a51eb1f0b832765df8723d82f0afac4 (patch) | |
| tree | ca4e9e95cb45d9275f6272b8ca1bab7f06e5eeff /tests/regressiontests/mail | |
| parent | f0a864b482cb3aad69424e33a7e259ddb831ea5f (diff) | |
| parent | cb5e5dc2bc232905c03deea6bc453a2e9a2338f1 (diff) | |
[gsoc2009-testing] Massive merge update to trunk. This is in preparation for the release of a sample app and tests
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/test-improvements@11385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/mail')
| -rw-r--r-- | tests/regressiontests/mail/tests.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/regressiontests/mail/tests.py b/tests/regressiontests/mail/tests.py index f4c416c231..e90d77366f 100644 --- a/tests/regressiontests/mail/tests.py +++ b/tests/regressiontests/mail/tests.py @@ -90,8 +90,8 @@ BadHeaderError: Header values can't contain newlines (got u'Subject\nInjection T # Make sure we can manually set the From header (#9214) ->>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'}) ->>> message = email.message() +>>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'}) +>>> message = email.message() >>> message['From'] 'from@example.com' @@ -115,8 +115,7 @@ To: to@example.com Date: Fri, 09 Nov 2001 01:08:47 -0000 Message-ID: foo ... -Content-Type: multipart/alternative; boundary="..." -MIME-Version: 1.0 +Content-Type: multipart/alternative;... ... Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 |