Fix a typo in a roster name.

Remove an outdated comment.

Add an SMTPServer wrapper class to the test helpers module.  This will be used
in tests of the outgoing queue, which actually needs to talk to an SMTP
server.  Adapt the smtpd-based server to being run under thread control, and
remove some now unnecessary code.

2 files changed, 0 insertions, 157 deletions

diff --git a/mailman/queue/docs/outgoing.txt b/mailman/queue/docs/outgoing.txt
deleted file mode 100644
index 3840b71ee..000000000
--- a/mailman/queue/docs/outgoing.txt
+++ /dev/null
@@ -1,155 +0,0 @@
-The outgoing handler
-====================
-
-Mailman's outgoing queue is used as the wrapper around SMTP delivery to the
-upstream mail server.  The ToOutgoing handler does little more than drop the
-message into the outgoing queue, after calculating whether the message should
-be VERP'd or not.  VERP means Variable Envelope Return Path; we're using that
-term somewhat incorrectly, but within the spirit of the standard, which
-basically describes how to encode the recipient's address in the originator
-headers for unambigous bounce processing.
-
-    >>> from mailman.queue import Switchboard
-    >>> from mailman.configuration import config
-    >>> handler = config.handlers['to-outgoing']
-    >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
-    >>> switchboard = Switchboard(config.OUTQUEUE_DIR)
-
-    >>> def queue_size():
-    ...     size = len(switchboard.files)
-    ...     for filebase in switchboard.files:
-    ...         msg, msgdata = switchboard.dequeue(filebase)
-    ...         switchboard.finish(filebase)
-    ...     return size
-
-Craft a message destined for the outgoing queue.  Include some random metadata
-as if this message had passed through some other handlers.
-
-    >>> msg = message_from_string("""\
-    ... Subject: Here is a message
-    ...
-    ... Something of great import.
-    ... """)
-
-When certain conditions are met, the message will be VERP'd.  For example, if
-the message metadata already has a VERP key, this message will be VERP'd.
-
-    >>> msgdata = dict(foo=1, bar=2, verp=True)
-    >>> handler.process(mlist, msg, msgdata)
-    >>> print msg.as_string()
-    Subject: Here is a message
-    <BLANKLINE>
-    Something of great import.
-    >>> msgdata['verp']
-    True
-
-While the queued message will not be changed, the queued metadata will have an
-additional key set: the mailing list name.
-
-    >>> filebase = switchboard.files[0]
-    >>> qmsg, qmsgdata = switchboard.dequeue(filebase)
-    >>> switchboard.finish(filebase)
-    >>> print qmsg.as_string()
-    Subject: Here is a message
-    <BLANKLINE>
-    Something of great import.
-    >>> sorted(qmsgdata.items())    
-    [('_parsemsg', False),
-     ('bar', 2), ('foo', 1),
-     ('listname', u'_xtest@example.com'),
-     ('received_time', ...),
-     ('verp', True), ('version', 3)]
-    >>> queue_size()
-    0
-
-If the list is set to personalize deliveries, and the global configuration
-option to VERP personalized deliveries is set, then the message will be
-VERP'd.
-
-    # Save the original value for clean up.
-    >>> verp_personalized_delivieries = config.VERP_PERSONALIZED_DELIVERIES
-    >>> config.VERP_PERSONALIZED_DELIVERIES = True
-    >>> from mailman.interfaces import Personalization
-    >>> mlist.personalize = Personalization.individual
-    >>> msgdata = dict(foo=1, bar=2)
-    >>> handler.process(mlist, msg, msgdata)
-    >>> msgdata['verp']
-    True
-    >>> queue_size()
-    1
-
-However, if the global configuration variable prohibits VERP'ing, even
-personalized lists will not VERP.
-
-    >>> config.VERP_PERSONALIZED_DELIVERIES = False
-    >>> msgdata = dict(foo=1, bar=2)
-    >>> handler.process(mlist, msg, msgdata)
-    >>> print msgdata.get('verp')
-    None
-    >>> queue_size()
-    1
-
-If the list is not personalized, then the message may still be VERP'd based on
-the global configuration variable VERP_DELIVERY_INTERVAL.  This variable tells
-Mailman how often to VERP even non-personalized mailing lists.  It can be set
-to zero, which means non-personalized messages will never be VERP'd.
-
-    # Save the original value for clean up.
-    >>> verp_delivery_interval = config.VERP_DELIVERY_INTERVAL
-    >>> config.VERP_DELIVERY_INTERVAL = 0
-    >>> mlist.personalize = Personalization.none
-    >>> msgdata = dict(foo=1, bar=2)
-    >>> handler.process(mlist, msg, msgdata)
-    >>> print msgdata.get('verp')
-    None
-    >>> queue_size()
-    1
-
-If the interval is set to 1, then every message will be VERP'd.
-
-    >>> config.VERP_DELIVERY_INTERVAL = 1
-    >>> for i in range(10):
-    ...     msgdata = dict(foo=1, bar=2)
-    ...     handler.process(mlist, msg, msgdata)
-    ...     print i, msgdata['verp']
-    0 True
-    1 True
-    2 True
-    3 True
-    4 True
-    5 True
-    6 True
-    7 True
-    8 True
-    9 True
-    >>> queue_size()
-    10
-
-If the interval is set to some other number, then one out of that many posts
-will be VERP'd.
-
-    >>> config.VERP_DELIVERY_INTERVAL = 3
-    >>> for i in range(10):
-    ...     mlist.post_id = i
-    ...     msgdata = dict(foo=1, bar=2)
-    ...     handler.process(mlist, msg, msgdata)
-    ...     print i, msgdata.get('verp', False)
-    0 True
-    1 False
-    2 False
-    3 True
-    4 False
-    5 False
-    6 True
-    7 False
-    8 False
-    9 True
-    >>> queue_size()
-    10
-
-
-Clean up
-========
-
-    >>> config.VERP_PERSONALIZED_DELIVERIES = verp_personalized_delivieries
-    >>> config.VERP_DELIVERY_INTERVAL = verp_delivery_interval
diff --git a/mailman/queue/lmtp.py b/mailman/queue/lmtp.py
index 23aa9b360..71ae2b9cc 100644
--- a/mailman/queue/lmtp.py
+++ b/mailman/queue/lmtp.py
@@ -38,8 +38,6 @@ See the variable USE_LMTP in Defaults.py.in for enabling this delivery
 mechanism.
 """
 
-# NOTE: LMTP delivery is experimental in Mailman 2.2.
-
 import os
 import email
 import smtpd