Permalink
Browse files

Adapted sendtestemail to be more argparse-ish

  • Loading branch information...
1 parent 0d9b018 commit ba37ac749ed090d0c675fd0525ae207ef1362bd8 @claudep claudep committed Mar 20, 2015
Showing with 5 additions and 11 deletions.
  1. +5 −4 django/core/management/commands/sendtestemail.py
  2. +0 −7 tests/mail/test_sendtestemail.py
@@ -7,14 +7,15 @@
class Command(BaseCommand):
help = "Sends a test email to the email addresses specified as arguments."
- args = "<email1 email2 ...>"
+
+ def add_arguments(self, parser):
+ parser.add_argument('email', nargs='+',
+ help='One or more email addresses to send the test mail to.')
def handle(self, *args, **kwargs):
- if not args:
- raise CommandError('You must provide at least one destination email.')
send_mail(
subject='Test email from %s on %s' % (socket.gethostname(), datetime.datetime.now()),
message="If you\'re reading this, it was successful.",
from_email=None,
- recipient_list=args,
+ recipient_list=kwargs['email'],
)
@@ -32,10 +32,3 @@ def test_send_test_email_with_multiple_addresses(self):
mail_message = mail.outbox[0]
self.assertEqual(mail_message.subject[0:15], 'Test email from')
self.assertEqual(mail_message.recipients(), recipients)
-
- def test_send_test_email_missing_recipient(self):
- """
- A CommandError is raised if no recipients are specified.
- """
- with self.assertRaisesMessage(CommandError, 'You must provide at least one destination email'):
- call_command("sendtestemail")

0 comments on commit ba37ac7

Please sign in to comment.