aussiegeek-ar_sendmail_delayed 1.3.2

data/lib/smtp_tls.rb

@@ -0,0 +1,105 @@
+# Original code believed public domain from ruby-talk or ruby-core email.
+# Modifications by Kyle Maxwell <kyle@kylemaxwell.com> used under MIT license.
+
+require "openssl"
+require "net/smtp"
+
+# :stopdoc:
+
+class Net::SMTP
+
+  class << self
+    send :remove_method, :start
+  end
+
+  def self.start( address, port = nil,
+                  helo = 'localhost.localdomain',
+                  user = nil, secret = nil, authtype = nil, use_tls = false,
+                  &block) # :yield: smtp
+    new(address, port).start(helo, user, secret, authtype, use_tls, &block)
+  end
+
+  alias tls_old_start start
+
+  def start( helo = 'localhost.localdomain',
+             user = nil, secret = nil, authtype = nil, use_tls = false ) # :yield: smtp
+    start_method = use_tls ? :do_tls_start : :do_start
+    if block_given?
+      begin
+        send start_method, helo, user, secret, authtype
+        return yield(self)
+      ensure
+        do_finish
+      end
+    else
+      send start_method, helo, user, secret, authtype
+      return self
+    end
+  end
+
+  private
+
+  def do_tls_start(helodomain, user, secret, authtype)
+    raise IOError, 'SMTP session already started' if @started
+    check_auth_args user, secret, authtype if user or secret
+
+    sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
+    @socket = Net::InternetMessageIO.new(sock)
+    @socket.read_timeout = 60 #@read_timeout
+    @socket.debug_output = STDERR #@debug_output
+
+    check_response(critical { recv_response() })
+    do_helo(helodomain)
+
+    raise 'openssl library not installed' unless defined?(OpenSSL)
+    starttls
+    ssl = OpenSSL::SSL::SSLSocket.new(sock)
+    ssl.sync_close = true
+    ssl.connect
+    @socket = Net::InternetMessageIO.new(ssl)
+    @socket.read_timeout = 60 #@read_timeout
+    @socket.debug_output = STDERR #@debug_output
+    do_helo(helodomain)
+
+    authenticate user, secret, authtype if user
+    @started = true
+  ensure
+    unless @started
+      # authentication failed, cancel connection.
+        @socket.close if not @started and @socket and not @socket.closed?
+      @socket = nil
+    end
+  end
+
+  def do_helo(helodomain)
+     begin
+      if @esmtp
+        ehlo helodomain
+      else
+        helo helodomain
+      end
+    rescue Net::ProtocolError
+      if @esmtp
+        @esmtp = false
+        @error_occured = false
+        retry
+      end
+      raise
+    end
+  end
+
+  def starttls
+    getok('STARTTLS')
+  end
+
+  alias tls_old_quit quit
+
+  def quit
+    begin
+      getok('QUIT')
+    rescue EOFError
+    end
+  end
+
+end unless Net::SMTP.private_method_defined? :do_tls_start or
+           Net::SMTP.method_defined? :tls?

data/share/ar_sendmail

@@ -0,0 +1,30 @@
+#!/bin/sh
+# PROVIDE: ar_sendmail
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable ar_sendmail:
+#
+#ar_sendmail_enable="YES"
+
+. /etc/rc.subr
+
+name="ar_sendmail"
+rcvar=`set_rcvar`
+
+command="/usr/local/bin/ar_sendmail"
+command_interpreter="/usr/local/bin/ruby18"
+
+# set defaults
+
+ar_sendmail_rails_env=${ar_sendmail_rails_env:-"production"}
+ar_sendmail_chdir=${ar_sendmail_chdir:-"/"}
+ar_sendmail_enable=${ar_sendmail_enable:-"NO"}
+ar_sendmail_flags=${ar_sendmail_flags:-"-d"}
+
+load_rc_config $name
+export RAILS_ENV=$ar_sendmail_rails_env
+run_rc_command "$1"
+

data/test/action_mailer.rb

@@ -0,0 +1,191 @@
+require 'net/smtp'
+require 'smtp_tls'
+require 'time'
+
+
+class Net::SMTP
+
+  @reset_called = 0
+
+  @deliveries = []
+
+  @send_message_block = nil
+
+  @start_block = nil
+
+  class << self
+
+    attr_reader :deliveries
+    attr_reader :send_message_block
+    attr_accessor :reset_called
+
+    send :remove_method, :start
+
+  end
+
+  def self.start(*args)
+    @start_block.call if @start_block
+    yield new(nil)
+  end
+
+  def self.on_send_message(&block)
+    @send_message_block = block
+  end
+
+  def self.on_start(&block)
+    @start_block = block
+  end
+
+  def self.reset
+    deliveries.clear
+    on_start
+    on_send_message
+    @reset_called = 0
+  end
+
+  alias test_old_reset reset if instance_methods.include? 'reset'
+
+  def reset
+    self.class.reset_called += 1
+  end
+
+  alias test_old_send_message send_message
+
+  def send_message(mail, to, from)
+    return self.class.send_message_block.call(mail, to, from) unless
+      self.class.send_message_block.nil?
+    self.class.deliveries << [mail, to, from]
+    return "queued"
+  end
+
+end
+
+##
+# Stub for ActionMailer::Base
+
+module ActionMailer; end
+
+class ActionMailer::Base
+
+  @server_settings = {}
+
+  def self.logger
+    o = Object.new
+    def o.info(arg) end
+    return o
+  end
+
+  def self.method_missing(meth, *args)
+    meth.to_s =~ /deliver_(.*)/
+    super unless $1
+    new($1, *args).deliver!
+  end
+
+  def self.reset
+    server_settings.clear
+  end
+
+  def self.server_settings
+    @server_settings
+  end
+
+  def initialize(meth = nil)
+    send meth if meth
+  end
+
+  def deliver!
+    perform_delivery_activerecord @mail
+  end
+
+end
+
+##
+# Stub for an ActiveRecord model
+
+class Email
+
+  START = Time.parse 'Thu Aug 10 2006 11:19:48'
+
+  attr_accessor :from, :to, :mail, :last_send_attempt, :created_on, :id, :deliver_after
+
+  @records = []
+  @id = 0
+
+  class << self; attr_accessor :records, :id; end
+
+  def self.create(record)
+    record = new record[:from], record[:to], record[:mail],
+                 record[:deliver_after], record[:last_send_attempt]
+    records << record
+    return record
+  end
+
+  def self.destroy_all(conditions)
+    timeout = conditions.last
+    found = []
+
+    records.each do |record|
+      next if record.last_send_attempt == 0
+      next if record.created_on == 0
+      next unless record.created_on < timeout
+      record.destroy
+      found << record
+    end
+
+    found
+  end
+
+  def self.find(_, conditions = nil)
+    if conditions.nil?
+      return records.select do |r|
+        r.deliver_after > Time.parse('Thu Aug 10 2006 11:19:48')
+      end
+    end
+    now = Time.now.to_i - 300
+    return records.select do |r|
+      r.last_send_attempt < now && r.deliver_after.to_i > Time.parse('Thu Aug 10 2006 11:19:48').to_i
+    end
+  end
+
+  def self.reset
+    @id = 0
+    records.clear
+  end
+
+  def initialize(from, to, mail, deliver_after, last_send_attempt = nil)
+    @from = from
+    @to = to
+    @mail = mail
+    @id = self.class.id += 1
+    @created_on = START + @id
+    @deliver_after=deliver_after || Time.now
+    @last_send_attempt = last_send_attempt || 0
+  end
+
+  def destroy
+    self.class.records.delete self
+    self.freeze
+  end
+
+  def ==(other)
+    other.id == id
+  end
+
+  def save
+  end
+
+end
+
+Mail = Email
+
+class String
+  def classify
+    self
+  end
+
+  def tableize
+    self.downcase
+  end
+
+end
+

data/test/test_armailer.rb

@@ -0,0 +1,56 @@
+require 'test/unit'
+require 'action_mailer'
+require 'action_mailer/ar_mailer'
+
+class Time
+  def now
+    Time.parse('Thu Aug 10 2006 11:41:05')
+  end
+end
+
+##
+# Pretend mailer
+
+class Mailer < ActionMailer::ARMailer
+
+  def mail
+    @mail = Object.new
+    def @mail.encoded() 'email' end
+    def @mail.from() ['nobody@example.com'] end
+    def @mail.destinations() %w[user1@example.com user2@example.com] end
+  end
+
+end
+
+class TestARMailer < Test::Unit::TestCase
+
+  def setup
+    Mailer.email_class = Email
+
+    Email.records.clear
+    Mail.records.clear
+  end
+
+  def test_self_email_class_equals
+    Mailer.email_class = Mail
+
+    Mailer.deliver_mail
+
+    assert_equal 2, Mail.records.length
+  end
+
+  def test_perform_delivery_activerecord
+    Mailer.deliver_mail
+
+    assert_equal 2, Email.records.length
+
+    record = Email.records.first
+    assert_equal 'email', record.mail
+    assert_equal 'user1@example.com', record.to
+    assert_equal 'nobody@example.com', record.from
+
+    assert_equal 'user2@example.com', Email.records.last.to
+  end
+
+end
+

data/test/test_arsendmail.rb

@@ -0,0 +1,648 @@
+require 'test/unit'
+require 'action_mailer'
+require 'action_mailer/ar_sendmail'
+require 'rubygems'
+require 'test/zentest_assertions'
+
+class ActionMailer::ARSendmail
+  attr_accessor :slept
+  def sleep(secs)
+    @slept ||= []
+    @slept << secs
+  end
+end
+
+class TestARSendmail < Test::Unit::TestCase
+
+  def setup
+    ActionMailer::Base.reset
+    Email.reset
+    Net::SMTP.reset
+
+    @sm = ActionMailer::ARSendmail.new
+    @sm.verbose = true
+
+    @include_c_e = ! $".grep(/config\/environment.rb/).empty?
+    $" << 'config/environment.rb' unless @include_c_e
+  end
+
+  def teardown
+    $".delete 'config/environment.rb' unless @include_c_e
+  end
+
+  def test_fake_time
+    assert_equal Time.now, Time.parse('Thu Aug 10 2006 11:41:05')
+  end
+  def test_class_create_migration
+    out, = util_capture do
+      ActionMailer::ARSendmail.create_migration 'Mail'
+    end
+
+    expected = <<-EOF
+class AddMail < ActiveRecord::Migration
+  def self.up
+    create_table :mail do |t|
+      t.column :from, :string
+      t.column :to, :string
+      t.column :last_send_attempt, :integer, :default => 0
+      t.column :deliver_after, :datetime
+      t.column :mail, :text
+      t.column :created_on, :datetime
+    end
+  end
+
+  def self.down
+    drop_table :mail
+  end
+end
+    EOF
+
+    assert_equal expected, out.string
+  end
+
+  def test_class_create_model
+    out, = util_capture do
+      ActionMailer::ARSendmail.create_model 'Mail'
+    end
+
+    expected = <<-EOF
+class Mail < ActiveRecord::Base
+end
+    EOF
+
+    assert_equal expected, out.string
+  end
+
+  def test_class_mailq
+    Email.create :from => nobody, :to => 'recip@h1.example.com',
+                 :mail => 'body0'
+    Email.create :from => nobody, :to => 'recip@h1.example.com',
+                 :mail => 'body1'
+    last = Email.create :from => nobody, :to => 'recip@h2.example.com',
+                        :mail => 'body2'
+    Email.create :from => nobody, :to => 'nextweek@h1.example.com',
+                 :mail => 'body0', :deliver_after => Time.parse('Sun Sep 10 2006 11:19:48')
+
+    last.last_send_attempt = Time.parse('Thu Aug 10 2006 11:40:05').to_i
+
+    out, err = util_capture do
+      ActionMailer::ARSendmail.mailq 'Email'
+    end
+
+    expected = <<-EOF
+-Queue ID- --Size-- ----Arrival Time---- -Sender/Recipient-------
+         1        5 Thu Aug 10 11:19:49  nobody@example.com
+                                         recip@h1.example.com
+
+         2        5 Thu Aug 10 11:19:50  nobody@example.com
+                                         recip@h1.example.com
+
+         3        5 Thu Aug 10 11:19:51  nobody@example.com
+Last send attempt: Thu Aug 10 11:40:05 +1000 2006
+                                         recip@h2.example.com
+
+-- 0 Kbytes in 3 Requests.
+    EOF
+
+    assert_equal expected, out.string
+  end
+
+  def test_class_mailq_empty
+    out, err = util_capture do
+      ActionMailer::ARSendmail.mailq 'Email'
+    end
+
+    assert_equal "Mail queue is empty\n", out.string
+  end
+
+  def test_class_new
+    @sm = ActionMailer::ARSendmail.new
+
+    assert_equal 60, @sm.delay
+    assert_equal Email, @sm.email_class
+    assert_equal nil, @sm.once
+    assert_equal nil, @sm.verbose
+    assert_equal nil, @sm.batch_size
+
+    @sm = ActionMailer::ARSendmail.new :Delay => 75, :Verbose => true,
+                                       :TableName => 'Object', :Once => true,
+                                       :BatchSize => 1000
+
+    assert_equal 75, @sm.delay
+    assert_equal Object, @sm.email_class
+    assert_equal true, @sm.once
+    assert_equal true, @sm.verbose
+    assert_equal 1000, @sm.batch_size
+  end
+
+  def test_class_parse_args_batch_size
+    options = ActionMailer::ARSendmail.process_args %w[-b 500]
+
+    assert_equal 500, options[:BatchSize]
+
+    options = ActionMailer::ARSendmail.process_args %w[--batch-size 500]
+
+    assert_equal 500, options[:BatchSize]
+  end
+
+  def test_class_parse_args_chdir
+    argv = %w[-c /tmp]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal '/tmp', options[:Chdir]
+
+    argv = %w[--chdir /tmp]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal '/tmp', options[:Chdir]
+
+    argv = %w[-c /nonexistent]
+    
+    out, err = util_capture do
+      assert_raises SystemExit do
+        ActionMailer::ARSendmail.process_args argv
+      end
+    end
+  end
+
+  def test_class_parse_args_daemon
+    argv = %w[-d]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal true, options[:Daemon]
+
+    argv = %w[--daemon]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal true, options[:Daemon]
+  end
+
+  def test_class_parse_args_delay
+    argv = %w[--delay 75]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal 75, options[:Delay]
+  end
+
+  def test_class_parse_args_environment
+    assert_equal nil, ENV['RAILS_ENV']
+
+    argv = %w[-e production]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal 'production', options[:RailsEnv]
+
+    assert_equal 'production', ENV['RAILS_ENV']
+
+    argv = %w[--environment production]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal 'production', options[:RailsEnv]
+  end
+
+  def test_class_parse_args_mailq
+    options = ActionMailer::ARSendmail.process_args []
+    deny_includes :MailQ, options
+
+    argv = %w[--mailq]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal true, options[:MailQ]
+  end
+
+  def test_class_parse_args_max_age
+    options = ActionMailer::ARSendmail.process_args []
+    assert_equal 86400 * 7, options[:MaxAge]
+
+    argv = %w[--max-age 86400]
+
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal 86400, options[:MaxAge]
+  end
+
+  def test_class_parse_args_migration
+    options = ActionMailer::ARSendmail.process_args []
+    deny_includes :Migration, options
+
+    argv = %w[--create-migration]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal true, options[:Migrate]
+  end
+
+  def test_class_parse_args_model
+    options = ActionMailer::ARSendmail.process_args []
+    deny_includes :Model, options
+
+    argv = %w[--create-model]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal true, options[:Model]
+  end
+
+  def test_class_parse_args_no_config_environment
+    $".delete 'config/environment.rb'
+
+    out, err = util_capture do
+      assert_raise SystemExit do
+        ActionMailer::ARSendmail.process_args []
+      end
+    end
+
+  ensure
+    $" << 'config/environment.rb' if @include_c_e
+  end
+
+  def test_class_parse_args_no_config_environment_migrate
+    $".delete 'config/environment.rb'
+
+    out, err = util_capture do
+      ActionMailer::ARSendmail.process_args %w[--create-migration]
+    end
+
+    assert true # count
+
+  ensure
+    $" << 'config/environment.rb' if @include_c_e
+  end
+
+  def test_class_parse_args_no_config_environment_model
+    $".delete 'config/environment.rb'
+
+    out, err = util_capture do
+      ActionMailer::ARSendmail.process_args %w[--create-model]
+    end
+
+    assert true # count
+
+  rescue SystemExit
+    flunk 'Should not exit'
+
+  ensure
+    $" << 'config/environment.rb' if @include_c_e
+  end
+
+  def test_class_parse_args_once
+    argv = %w[-o]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal true, options[:Once]
+
+    argv = %w[--once]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal true, options[:Once]
+  end
+
+  def test_class_parse_args_table_name
+    argv = %w[-t Email]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal 'Email', options[:TableName]
+
+    argv = %w[--table-name=Email]
+    
+    options = ActionMailer::ARSendmail.process_args argv
+
+    assert_equal 'Email', options[:TableName]
+  end
+
+  def test_class_usage
+    out, err = util_capture do
+      assert_raises SystemExit do
+        ActionMailer::ARSendmail.usage 'opts'
+      end
+    end
+
+    assert_equal '', out.string
+    assert_equal "opts\n", err.string
+
+    out, err = util_capture do
+      assert_raises SystemExit do
+        ActionMailer::ARSendmail.usage 'opts', 'hi'
+      end
+    end
+
+    assert_equal '', out.string
+    assert_equal "hi\n\nopts\n", err.string
+  end
+
+  def test_cleanup
+    e1 = Email.create :mail => 'body', :to => 'to', :from => 'from'
+    e1.created_on = Time.now
+    e2 = Email.create :mail => 'body', :to => 'to', :from => 'from'
+    e3 = Email.create :mail => 'body', :to => 'to', :from => 'from'
+    e3.last_send_attempt = Time.now
+
+    out, err = util_capture do
+      @sm.cleanup
+    end
+
+    assert_equal '', out.string
+    assert_equal "expired 1 emails from the queue\n", err.string
+    assert_equal 2, Email.records.length
+
+    assert_equal [e1, e2], Email.records
+  end
+
+  def test_cleanup_disabled
+    e1 = Email.create :mail => 'body', :to => 'to', :from => 'from'
+    e1.created_on = Time.now
+    e2 = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    @sm.max_age = 0
+
+    out, err = util_capture do
+      @sm.cleanup
+    end
+
+    assert_equal '', out.string
+    assert_equal 2, Email.records.length
+  end
+
+  def test_deliver
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    out, err = util_capture do
+      @sm.deliver [email]
+    end
+
+    assert_equal 1, Net::SMTP.deliveries.length
+    assert_equal ['body', 'from', 'to'], Net::SMTP.deliveries.first
+    assert_equal 0, Email.records.length
+    assert_equal 0, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
+
+    assert_equal '', out.string
+    assert_equal "sent email 00000000001 from from to to: \"queued\"\n", err.string
+  end
+
+  def test_deliver_auth_error
+    Net::SMTP.on_start do
+      e = Net::SMTPAuthenticationError.new 'try again'
+      e.set_backtrace %w[one two three]
+      raise e
+    end
+
+    now = Time.now.to_i
+
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    out, err = util_capture do
+      @sm.deliver [email]
+    end
+
+    assert_equal 0, Net::SMTP.deliveries.length
+    assert_equal 1, Email.records.length
+    assert_equal 0, Email.records.first.last_send_attempt
+    assert_equal 0, Net::SMTP.reset_called
+    assert_equal 1, @sm.failed_auth_count
+    assert_equal [60], @sm.slept
+
+    assert_equal '', out.string
+    assert_equal "authentication error, retrying: try again\n", err.string
+  end
+
+  def test_deliver_auth_error_recover
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+    @sm.failed_auth_count = 1
+
+    out, err = util_capture do @sm.deliver [email] end
+
+    assert_equal 0, @sm.failed_auth_count
+    assert_equal 1, Net::SMTP.deliveries.length
+  end
+
+  def test_deliver_auth_error_twice
+    Net::SMTP.on_start do
+      e = Net::SMTPAuthenticationError.new 'try again'
+      e.set_backtrace %w[one two three]
+      raise e
+    end
+
+    @sm.failed_auth_count = 1
+
+    out, err = util_capture do
+      assert_raise Net::SMTPAuthenticationError do
+        @sm.deliver []
+      end
+    end
+
+    assert_equal 2, @sm.failed_auth_count
+    assert_equal "authentication error, giving up: try again\n", err.string
+  end
+
+  def test_deliver_4xx_error
+    Net::SMTP.on_send_message do
+      e = Net::SMTPSyntaxError.new 'try again'
+      e.set_backtrace %w[one two three]
+      raise e
+    end
+
+    now = Time.now.to_i
+
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    out, err = util_capture do
+      @sm.deliver [email]
+    end
+
+    assert_equal 0, Net::SMTP.deliveries.length
+    assert_equal 1, Email.records.length
+    assert_operator now, :<=, Email.records.first.last_send_attempt
+    assert_equal 1, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
+
+    assert_equal '', out.string
+    assert_equal "error sending email 1: \"try again\"(Net::SMTPSyntaxError):\n\tone\n\ttwo\n\tthree\n", err.string
+  end
+
+  def test_deliver_5xx_error
+    Net::SMTP.on_send_message do
+      e = Net::SMTPFatalError.new 'unknown recipient'
+      e.set_backtrace %w[one two three]
+      raise e
+    end
+
+    now = Time.now.to_i
+
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    out, err = util_capture do
+      @sm.deliver [email]
+    end
+
+    assert_equal 0, Net::SMTP.deliveries.length
+    assert_equal 0, Email.records.length
+    assert_equal 1, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
+
+    assert_equal '', out.string
+    assert_equal "5xx error sending email 1, removing from queue: \"unknown recipient\"(Net::SMTPFatalError):\n\tone\n\ttwo\n\tthree\n", err.string
+  end
+
+  def test_deliver_errno_epipe
+    Net::SMTP.on_send_message do
+      raise Errno::EPIPE
+    end
+
+    now = Time.now.to_i
+
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    out, err = util_capture do
+      @sm.deliver [email]
+    end
+
+    assert_equal 0, Net::SMTP.deliveries.length
+    assert_equal 1, Email.records.length
+    assert_operator now, :>=, Email.records.first.last_send_attempt
+    assert_equal 0, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
+
+    assert_equal '', out.string
+    assert_equal '', err.string
+  end
+
+  def test_deliver_server_busy
+    Net::SMTP.on_send_message do
+      e = Net::SMTPServerBusy.new 'try again'
+      e.set_backtrace %w[one two three]
+      raise e
+    end
+
+    now = Time.now.to_i
+
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    out, err = util_capture do
+      @sm.deliver [email]
+    end
+
+    assert_equal 0, Net::SMTP.deliveries.length
+    assert_equal 1, Email.records.length
+    assert_operator now, :>=, Email.records.first.last_send_attempt
+    assert_equal 0, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
+    assert_equal [60], @sm.slept
+
+    assert_equal '', out.string
+    assert_equal "server too busy, sleeping 60 seconds\n", err.string
+  end
+
+  def test_deliver_syntax_error
+    Net::SMTP.on_send_message do
+      Net::SMTP.on_send_message # clear
+      e = Net::SMTPSyntaxError.new 'blah blah blah'
+      e.set_backtrace %w[one two three]
+      raise e
+    end
+
+    now = Time.now.to_i
+
+    email1 = Email.create :mail => 'body', :to => 'to', :from => 'from'
+    email2 = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    out, err = util_capture do
+      @sm.deliver [email1, email2]
+    end
+
+    assert_equal 1, Net::SMTP.deliveries.length, 'delivery count'
+    assert_equal 1, Email.records.length
+    assert_equal 1, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
+    assert_operator now, :<=, Email.records.first.last_send_attempt
+
+    assert_equal '', out.string
+    assert_equal "error sending email 1: \"blah blah blah\"(Net::SMTPSyntaxError):\n\tone\n\ttwo\n\tthree\nsent email 00000000002 from from to to: \"queued\"\n", err.string
+  end
+
+  def test_deliver_timeout
+    Net::SMTP.on_send_message do
+      e = Timeout::Error.new 'timed out'
+      e.set_backtrace %w[one two three]
+      raise e
+    end
+
+    now = Time.now.to_i
+
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    out, err = util_capture do
+      @sm.deliver [email]
+    end
+
+    assert_equal 0, Net::SMTP.deliveries.length
+    assert_equal 1, Email.records.length
+    assert_operator now, :>=, Email.records.first.last_send_attempt
+    assert_equal 1, Net::SMTP.reset_called, 'Reset connection on Timeout'
+
+    assert_equal '', out.string
+    assert_equal "error sending email 1: \"timed out\"(Timeout::Error):\n\tone\n\ttwo\n\tthree\n", err.string
+  end
+
+  def test_do_exit
+    out, err = util_capture do
+      assert_raise SystemExit do
+        @sm.do_exit
+      end
+    end
+
+    assert_equal '', out.string
+    assert_equal "caught signal, shutting down\n", err.string
+  end
+
+  def test_log
+    out, err = util_capture do
+      @sm.log 'hi'
+    end
+
+    assert_equal "hi\n", err.string
+  end
+
+  def test_find_emails
+    email_data = [
+      { :mail => 'body0', :to => 'recip@h1.example.com', :from => nobody },
+      { :mail => 'body1', :to => 'recip@h1.example.com', :from => nobody },
+      { :mail => 'body2', :to => 'recip@h2.example.com', :from => nobody },
+    ]
+
+    emails = email_data.map do |email_data| Email.create email_data end
+
+    tried = Email.create :mail => 'body3', :to => 'recip@h3.example.com',
+                         :from => nobody
+
+    tried.last_send_attempt = Time.now.to_i - 258
+
+    found_emails = []
+
+    out, err = util_capture do
+      found_emails = @sm.find_emails
+    end
+
+    assert_equal emails, found_emails
+
+    assert_equal '', out.string
+    assert_equal "found 3 emails to send\n", err.string
+  end
+
+  def test_smtp_settings
+    ActionMailer::Base.server_settings[:address] = 'localhost'
+
+    assert_equal 'localhost', @sm.smtp_settings[:address]
+  end
+
+  def nobody
+    'nobody@example.com'
+  end
+
+end
+