diff --git a/anymail/models.py b/anymail/models.py deleted file mode 100644 index c8f74d2..0000000 --- a/anymail/models.py +++ /dev/null @@ -1 +0,0 @@ -# this empty models.py is here for Django testrunner compatibility pre Django 1.6 diff --git a/runtests.py b/runtests.py index 6d6f50a..2080522 100644 --- a/runtests.py +++ b/runtests.py @@ -3,7 +3,11 @@ # python runtests.py [anymail.tests.test_x anymail.tests.test_y.SomeTestCase ...] import sys + +from django import setup from django.conf import settings +from django.test.runner import DiscoverRunner as TestRunner + APP = 'anymail' @@ -37,17 +41,8 @@ settings.configure( ], ) -try: - # Django 1.7+ initialize app registry - from django import setup - setup() -except ImportError: - pass - -try: - from django.test.runner import DiscoverRunner as TestRunner # Django 1.6+ -except ImportError: - from django.test.simple import DjangoTestSuiteRunner as TestRunner # Django -1.5 +# Initialize Django app registry +setup() def runtests(*args): diff --git a/tests/__init__.py b/tests/__init__.py index d766f99..e69de29 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,18 +0,0 @@ -# Exposing all TestCases at the 'tests' module level -# is required by the old (<=1.5) DjangoTestSuiteRunner. - -from .test_mailgun_backend import * -from .test_mailgun_integration import * - -from .test_mandrill_backend import * -from .test_mandrill_integration import * - -from .test_postmark_backend import * -from .test_postmark_integration import * - -from .test_sendgrid_backend import * -from .test_sendgrid_webhooks import * -from .test_sendgrid_integration import * - -# Djrill leftovers: -from .test_mandrill_djrill_features import * diff --git a/tests/test_mailgun_backend.py b/tests/test_mailgun_backend.py index 47bb03a..23488e3 100644 --- a/tests/test_mailgun_backend.py +++ b/tests/test_mailgun_backend.py @@ -111,15 +111,9 @@ class MailgunBackendStandardEmailTests(MailgunBackendMockAPITestCase): self.assertEqual(data['html'], html_content) def test_reply_to(self): - # reply_to is new in Django 1.8 -- before that, you can simply include it in headers - try: - # noinspection PyArgumentList - email = mail.EmailMessage('Subject', 'Body goes here', 'from@example.com', ['to1@example.com'], - reply_to=['reply@example.com', 'Other '], - headers={'X-Other': 'Keep'}) - except TypeError: - # Pre-Django 1.8 - return self.skipTest("Django version doesn't support EmailMessage(reply_to)") + email = mail.EmailMessage('Subject', 'Body goes here', 'from@example.com', ['to1@example.com'], + reply_to=['reply@example.com', 'Other '], + headers={'X-Other': 'Keep'}) email.send() data = self.get_api_call_data() self.assertEqual(data['h:Reply-To'], 'reply@example.com, Other ') diff --git a/tests/test_mandrill_backend.py b/tests/test_mandrill_backend.py index 280fbac..8afbe2d 100644 --- a/tests/test_mandrill_backend.py +++ b/tests/test_mandrill_backend.py @@ -132,15 +132,9 @@ class MandrillBackendStandardEmailTests(MandrillBackendMockAPITestCase): self.assertEqual(data['message']['html'], html_content) def test_reply_to(self): - # reply_to is new in Django 1.8 -- before that, you can simply include it in headers - try: - # noinspection PyArgumentList - email = mail.EmailMessage('Subject', 'Body goes here', 'from@example.com', ['to1@example.com'], - reply_to=['reply@example.com', 'Other '], - headers={'X-Other': 'Keep'}) - except TypeError: - # Pre-Django 1.8 - raise unittest.SkipTest("Django version doesn't support EmailMessage(reply_to)") + email = mail.EmailMessage('Subject', 'Body goes here', 'from@example.com', ['to1@example.com'], + reply_to=['reply@example.com', 'Other '], + headers={'X-Other': 'Keep'}) email.send() data = self.get_api_call_json() self.assertEqual(data['message']['headers']['Reply-To'], diff --git a/tests/test_postmark_backend.py b/tests/test_postmark_backend.py index 1ecd88a..b813b63 100644 --- a/tests/test_postmark_backend.py +++ b/tests/test_postmark_backend.py @@ -130,15 +130,9 @@ class PostmarkBackendStandardEmailTests(PostmarkBackendMockAPITestCase): self.message.send() def test_reply_to(self): - # reply_to is new in Django 1.8 -- before that, you can simply include it in headers - try: - # noinspection PyArgumentList - email = mail.EmailMessage('Subject', 'Body goes here', 'from@example.com', ['to1@example.com'], - reply_to=['reply@example.com', 'Other '], - headers={'X-Other': 'Keep'}) - except TypeError: - # Pre-Django 1.8 - return self.skipTest("Django version doesn't support EmailMessage(reply_to)") + email = mail.EmailMessage('Subject', 'Body goes here', 'from@example.com', ['to1@example.com'], + reply_to=['reply@example.com', 'Other '], + headers={'X-Other': 'Keep'}) email.send() data = self.get_api_call_json() self.assertEqual(data['ReplyTo'], 'reply@example.com, Other ') diff --git a/tests/test_sendgrid_backend.py b/tests/test_sendgrid_backend.py index 40ea809..3a3a9c3 100644 --- a/tests/test_sendgrid_backend.py +++ b/tests/test_sendgrid_backend.py @@ -169,15 +169,9 @@ class SendGridBackendStandardEmailTests(SendGridBackendMockAPITestCase): self.message.send() def test_reply_to(self): - # reply_to is new in Django 1.8 -- before that, you can simply include it in headers - try: - # noinspection PyArgumentList - email = mail.EmailMessage('Subject', 'Body goes here', 'from@example.com', ['to1@example.com'], - reply_to=['reply@example.com', 'Other '], - headers={'X-Other': 'Keep'}) - except TypeError: - # Pre-Django 1.8 - return self.skipTest("Django version doesn't support EmailMessage(reply_to)") + email = mail.EmailMessage('Subject', 'Body goes here', 'from@example.com', ['to1@example.com'], + reply_to=['reply@example.com', 'Other '], + headers={'X-Other': 'Keep'}) email.send() data = self.get_api_call_data() self.assertNotIn('replyto', data) # don't use SendGrid's replyto (it's broken); just use headers