Merge lp:~barry/launchpad/435604-mailman into lp:launchpad

[Barry Warsaw]

[Barry Warsaw (barry)]

 reviewer rockstar

= Summary =

Bug 435604 describes a critical problem we discovered while rolling out LP 3.0
on forster, the Mailman (and other) server. The problem is that with the move
to buildout for a lot of our packages, the sys.path that the Mailman binary
uses was not correct. The binary uses the system Python, not bin/py so none
of the buildout eggs were visible to it.

== Proposed fix ==

Extend the path hacking done in Mailman's mm_cfg.py to pick up the necessary
buildout eggs. Do this by importing _pythonpath.

== Pre-implementation notes ==

Discussion during cowboy rollout with gary, spm, and stub.

== Implementation details ==

Along the way, I updated all the MailmanLayer tests. These should all pass
now, with the usual caveat that these tests are flaky. That's why we don't
run them as part of our normal test suite.

== Tests ==

To test the specific critical fix in this branch, run:

% bin/test -vv --layer=MailmanLayer -t basic-integration

To see that all the tests have been updated for LP 3.0, run:

% bin/test -vv --layer=MailmanLayer

You may get spurious failures from the above. Your choices are to run each
test in lib/lp/services/mailman/doc separately, or/and do 'make clean && make'
between each run.

== Demo and Q/A ==

No demo or Q/A. Once we cherry pick this onto forster, if the mailing lists
work, we're gold.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/services/mailman/doc/logging.txt
  lib/lp/services/mailman/doc/subscriptions.txt
  lib/canonical/launchpad/mailman/monkeypatches/__init__.py
  lib/lp/services/mailman/testing/logwatcher.py
  lib/lp/services/mailman/doc/postings.txt
  lib/lp/services/mailman/doc/bounces.txt
  lib/lp/services/mailman/doc/basic-integration.txt
  lib/lp/services/mailman/doc/decorations.txt
  lib/lp/services/mailman/doc/messages.txt
  lib/lp/services/mailman/doc/recovery.txt
  lib/lp/services/mailman/doc/reactivate-lists.txt
  lib/lp/services/mailman/doc/create-lists.txt
  lib/canonical/launchpad/mailman/monkeypatches/mm_cfg.py.in
  lib/lp/services/mailman/doc/contact-address.txt
  lib/lp/services/mailman/doc/staging.txt
  lib/lp/services/mailman/testing/helpers.py
  lib/lp/services/mailman/doc/modify-lists.txt

== Pyflakes Doctest notices ==

lib/lp/services/mailman/doc/logging.txt
    70: undefined name 'error_watcher'
    71: undefined name 'error_watcher'
    74: undefined name 'error_watcher'
    75: undefined name 'error_watcher'

lib/lp/services/mailman/doc/postings.txt
    14: undefined name 'smtpd'
    35: undefined name 'vette_watcher'
    36: undefined name 'smtpd'
    73: undefined name 'vette_watcher'
    74: undefined name 'smtpd'
    88: undefined name 'smtpd'
    89: undefined name 'smtpd'
    99: undefined name 'vette_watcher'
    103: undefined name 'smtpd_watcher'
    104: undefined name 'smtpd'
    156: undefined name 'Browser'
    168: undefined name 'smtpd_watcher'
    169: undefined name 'smtpd'
    212: undefined name 'vette_watcher'
    213: undefined name 'smtpd'
    244: undefined name 'smtpd'
    259: undefine...

[Paul Hummer (rockstar)]

review: Approve

[Brad Crittenden (bac)]

Hi Barry,

Thanks for the fix. Not to beat a dead horse, but in the future try to keep RC candidate branches as tiny as possible.

Thanks also for hanging around last night as the release happened to ensure everything worked.

review: Approve (release-critical)

=== modified file 'lib/canonical/launchpad/mailman/monkeypatches/__init__.py'
--- lib/canonical/launchpad/mailman/monkeypatches/__init__.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/launchpad/mailman/monkeypatches/__init__.py	2009-09-24 20:25:22 +0000
@@ -38,7 +38,8 @@
     # will get appended to Mailman's sys.path.
     import canonical
     from canonical.launchpad.mailman.config import configure_siteowner
-    launchpad_top = os.path.dirname(os.path.dirname(canonical.__file__))
+    launchpad_top = os.path.dirname(
+        os.path.dirname(os.path.dirname(canonical.__file__)))
     # Read the email footer template for all Launchpad messages.
     from canonical.launchpad.helpers import get_email_template
     footer = get_email_template('mailinglist-footer.txt')
@@ -46,85 +47,39 @@
     host, port = as_host_port(config.mailman.smtp)
     owner_address, owner_password = configure_siteowner(
         config.mailman.build_site_list_owner)
-    config_path = os.path.join(mailman_path, 'Mailman', 'mm_cfg.py')
-    config_file = open(config_path, 'w')
-    try:
-        print >> config_file, """\
-# Automatically generated by runlaunchpad.py
-
-# Set up Mailman's sys.path to pick up the top of Launchpad's tree
-import sys
-sys.path.insert(0, '%(launchpad_top)s')
-
-# Pick up Launchpad static overrides.  This will also pick up the standard
-# Mailman.Defaults.* variables.
-from canonical.launchpad.mailman.monkeypatches.defaults import *
-
-# Our dynamic overrides of all the static defaults.
-SMTPHOST = '%(smtp_host)s'
-SMTPPORT = %(smtp_port)d
-
-# Configuration options for the XMLRPCRunner.
-XMLRPC_URL = '%(xmlrpc_url)s'
-XMLRPC_SLEEPTIME = %(xmlrpc_sleeptime)s
-XMLRPC_SUBSCRIPTION_BATCH_SIZE = %(xmlrpc_subscription_batch_size)s
-LAUNCHPAD_SHARED_SECRET = '%(shared_secret)s'
-
-# RFC 2369 header information.
-LIST_HELP_HEADER = '%(list_help_header)s'
-LIST_SUBSCRIPTION_HEADERS = '%(list_subscription_headers)s'
-LIST_ARCHIVE_HEADER_TEMPLATE = '%(archive_url_template)s'
-LIST_OWNER_HEADER_TEMPLATE = '%(list_owner_header_template)s'
-
-# Soft and hard maximum message size limits.  Anything below the soft limit is
-# allowed directly through.  Between the soft and hard limits, the message is
-# held for approval.  Above the hard limit, the message is logged and
-# discarded.  Note that the normal Mailman size thresholds are ignored.
-LAUNCHPAD_SOFT_MAX_SIZE = %(soft_max_size)d
-LAUNCHPAD_HARD_MAX_SIZE = %(hard_max_size)d
-
-SITE_LIST_OWNER = '%(site_list_owner)s'
-
-DEFAULT_MSG_FOOTER = '''_______________________________________________
-%(footer)s'''
-
-# Set up MHonArc archiving.
-PUBLIC_EXTERNAL_ARCHIVER = '/usr/bin/mhonarc \
--add \
--dbfile %(var_dir)s/archives/private/%%(listname)s.mbox/mhonarc.db \
--outdir %(var_dir)s/mhonarc/%%(listname)s \
--definevar ML-NAME=%%(listname)s \
--rcfile %(var_dir)s/data/lp-mhonarc-common.mrc \
--stderr %(var_dir)s/logs/mhonarc \
--stdout %(var_dir)s/logs/mhonarc \
--spammode \
--umask 022'
-PRIVATE_EXTERNAL_ARCHIVER = PUBLIC_EXTERNAL_ARCHIVER
-
-# How often do we run the bounce processor?  For production, the default 15
-# minutes is fine, for testing we want to run it more often.
-REGISTER_BOUNCES_EVERY = %(register_bounces_every)d
-""" % dict(
-    launchpad_top=launchpad_top,
-    smtp_host=host,
-    smtp_port=port,
-    xmlrpc_url=config.mailman.xmlrpc_url,
-    xmlrpc_sleeptime=config.mailman.xmlrpc_runner_sleep,
-    xmlrpc_subscription_batch_size=config.mailman.subscription_batch_size,
-    site_list_owner=owner_address,
-    list_help_header=config.mailman.list_help_header,
-    list_subscription_headers=config.mailman.list_subscription_headers,
-    archive_url_template=config.mailman.archive_url_template,
-    list_owner_header_template=config.mailman.list_owner_header_template,
-    footer=footer,
-    var_dir=config.mailman.build_var_dir,
-    shared_secret=config.mailman.shared_secret,
-    soft_max_size=config.mailman.soft_max_size,
-    hard_max_size=config.mailman.hard_max_size,
-    register_bounces_every=config.mailman.register_bounces_every,
-    )
-    finally:
-        config_file.close()
+    config_path_in = os.path.join(os.path.dirname(__file__), 'mm_cfg.py.in')
+    config_file_in = open(config_path_in)
+    try:
+        config_template = config_file_in.read()
+    finally:
+        config_file_in.close()
+    config_path_out = os.path.join(mailman_path, 'Mailman', 'mm_cfg.py')
+    config_file_out = open(config_path_out, 'w')
+    try:
+        print >> config_file_out, config_template % dict(
+            launchpad_top=launchpad_top,
+            smtp_host=host,
+            smtp_port=port,
+            xmlrpc_url=config.mailman.xmlrpc_url,
+            xmlrpc_sleeptime=config.mailman.xmlrpc_runner_sleep,
+            xmlrpc_subscription_batch_size
+                =config.mailman.subscription_batch_size,
+            site_list_owner=owner_address,
+            list_help_header=config.mailman.list_help_header,
+            list_subscription_headers
+                =config.mailman.list_subscription_headers,
+            archive_url_template=config.mailman.archive_url_template,
+            list_owner_header_template
+                =config.mailman.list_owner_header_template,
+            footer=footer,
+            var_dir=config.mailman.build_var_dir,
+            shared_secret=config.mailman.shared_secret,
+            soft_max_size=config.mailman.soft_max_size,
+            hard_max_size=config.mailman.hard_max_size,
+            register_bounces_every=config.mailman.register_bounces_every,
+            )
+    finally:
+        config_file_out.close()
     # Mailman's qrunner system requires runner modules to live in the
     # Mailman.Queue package.  Set things up so that there's a hook module in
     # there for the XMLRPCRunner.
 
=== added file 'lib/canonical/launchpad/mailman/monkeypatches/mm_cfg.py.in'
--- lib/canonical/launchpad/mailman/monkeypatches/mm_cfg.py.in	1970-01-01 00:00:00 +0000
+++ lib/canonical/launchpad/mailman/monkeypatches/mm_cfg.py.in	2009-09-24 20:25:22 +0000
@@ -0,0 +1,65 @@
+# Automatically generated by runlaunchpad.py
+
+# Initialize sys.path so that the Mailman processes, which use the standard
+# system Python instead of buildout's bin/py, can find all the necessary
+# packages and modules.  Some of these are in sourcecode and some are in
+# buildout eggs.
+#
+# This is a two-step process.  First, we hack sys.path in order to find a
+# directory containing _pythonpath.  Then the _pythonpath module does all the
+# subsequent sys.path hacking necessary.
+
+# Set up Mailman's sys.path to pick up the top of Launchpad's tree.  This only
+# gets us a sys.path
+import sys
+sys.path.insert(0, '%(launchpad_top)s')
+import _pythonpath
+
+# Pick up Launchpad static overrides.  This will also pick up the standard
+# Mailman.Defaults.* variables.
+from canonical.launchpad.mailman.monkeypatches.defaults import *
+
+# Our dynamic overrides of all the static defaults.
+SMTPHOST = '%(smtp_host)s'
+SMTPPORT = %(smtp_port)d
+
+# Configuration options for the XMLRPCRunner.
+XMLRPC_URL = '%(xmlrpc_url)s'
+XMLRPC_SLEEPTIME = %(xmlrpc_sleeptime)s
+XMLRPC_SUBSCRIPTION_BATCH_SIZE = %(xmlrpc_subscription_batch_size)s
+LAUNCHPAD_SHARED_SECRET = '%(shared_secret)s'
+
+# RFC 2369 header information.
+LIST_HELP_HEADER = '%(list_help_header)s'
+LIST_SUBSCRIPTION_HEADERS = '%(list_subscription_headers)s'
+LIST_ARCHIVE_HEADER_TEMPLATE = '%(archive_url_template)s'
+LIST_OWNER_HEADER_TEMPLATE = '%(list_owner_header_template)s'
+
+# Soft and hard maximum message size limits.  Anything below the soft limit is
+# allowed directly through.  Between the soft and hard limits, the message is
+# held for approval.  Above the hard limit, the message is logged and
+# discarded.  Note that the normal Mailman size thresholds are ignored.
+LAUNCHPAD_SOFT_MAX_SIZE = %(soft_max_size)d
+LAUNCHPAD_HARD_MAX_SIZE = %(hard_max_size)d
+
+SITE_LIST_OWNER = '%(site_list_owner)s'
+
+DEFAULT_MSG_FOOTER = '''_______________________________________________
+%(footer)s'''
+
+# Set up MHonArc archiving.
+PUBLIC_EXTERNAL_ARCHIVER = '/usr/bin/mhonarc \
+-add \
+-dbfile %(var_dir)s/archives/private/%%(listname)s.mbox/mhonarc.db \
+-outdir %(var_dir)s/mhonarc/%%(listname)s \
+-definevar ML-NAME=%%(listname)s \
+-rcfile %(var_dir)s/data/lp-mhonarc-common.mrc \
+-stderr %(var_dir)s/logs/mhonarc \
+-stdout %(var_dir)s/logs/mhonarc \
+-spammode \
+-umask 022'
+PRIVATE_EXTERNAL_ARCHIVER = PUBLIC_EXTERNAL_ARCHIVER
+
+# How often do we run the bounce processor?  For production, the default 15
+# minutes is fine, for testing we want to run it more often.
+REGISTER_BOUNCES_EVERY = %(register_bounces_every)d
 
=== modified file 'lib/lp/services/mailman/doc/basic-integration.txt'
--- lib/lp/services/mailman/doc/basic-integration.txt	2009-06-23 17:51:24 +0000
+++ lib/lp/services/mailman/doc/basic-integration.txt	2009-09-24 20:25:22 +0000
@@ -29,3 +29,92 @@
 
     >>> withlist('withlist_2.can_import', '-q')
     99
+
+
+Binaries
+========
+
+Mailman contains a number of binary wrappers for integration between the MTA
+and Mailman.  Mailman's 'post' command accepts standard input from the MTA and
+drops the resulting message in Mailman's incoming queue.
+
+    # See `subscriptions.txt`_ for more details.
+    >>> from lp.services.mailman.testing import helpers
+    >>> alpha = helpers.create_list('alpha')
+    >>> helpers.subscribe('Anne', 'alpha')
+
+    # Ignore the list creation notification message.
+    >>> smtpd.reset()
+
+    >>> sample_message = """\
+    ... From: [e-mail]
+    ... To: [e-mail]
+    ... Subject: A test message
+    ... Message-ID: <aardvark>
+    ...
+    ... This is a test message.
+    ... """
+
+    # The path to the binary we're testing is relative to the top of the
+    # Launchpad source tree.
+    >>> import canonical
+    >>> launchpad_top = os.path.dirname(
+    ...     os.path.dirname(os.path.dirname(canonical.__file__)))
+    >>> binary = os.path.join(launchpad_top,
+    ...     'lib/mailman/mail/mailman')
+
+    >>> mailman = subprocess.Popen(
+    ...     (binary, 'post', 'alpha'),
+    ...     stdin=subprocess.PIPE,
+    ...     stdout=subprocess.PIPE,
+    ...     stderr=subprocess.PIPE)
+
+    >>> stdout, stderr = mailman.communicate(sample_message)
+    >>> mailman.returncode
+    0
+    >>> print stdout
+    <BLANKLINE>
+    >>> print stderr
+    <BLANKLINE>
+
+The message was delivered to Anne and the archiver.
+
+    >>> smtpd_watcher.wait_for_mbox_delivery('aardvark')
+    >>> messages = list(smtpd)
+    >>> len(messages)
+    2
+
+    >>> for message in messages:
+    ...     if message['x-rcptto'] == '[e-mail]':
+    ...         break
+
+    >>> print message.as_string()
+    From: [e-mail]
+    To: [e-mail]
+    Message-ID: <aardvark>
+    Subject: [Alpha] A test message
+    X-BeenThere: [e-mail]
+    X-Mailman-Version: ...
+    Precedence: list
+    List-Id: <alpha.lists.launchpad.dev>
+    List-Help: <http://help.launchpad.dev/ListHelp>
+    List-Subscribe: <http://launchpad.dev/~alpha>
+    List-Unsubscribe: <http://launchpad.dev/~alpha>
+    List-Post: <mailto:[e-mail]>
+    List-Archive: <http://lists.launchpad.dev/alpha>
+    List-Owner: <http://launchpad.dev/~alpha>
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset="us-ascii"
+    Content-Transfer-Encoding: 7bit
+    Sender: alpha-bounces+anne.person=[e-mail]
+    Errors-To: alpha-bounces+anne.person=[e-mail]
+    X-Peer: ...
+    X-MailFrom: alpha-bounces+anne.person=[e-mail]
+    X-RcptTo: [e-mail]
+    <BLANKLINE>
+    This is a test message.
+    _______________________________________________
+    Mailing list: http://launchpad.dev/~alpha
+    Post to     : [e-mail]
+    Unsubscribe : http://launchpad.dev/~alpha
+    More help   : http://help.launchpad.dev/ListHelp
 
=== modified file 'lib/lp/services/mailman/doc/bounces.txt'
--- lib/lp/services/mailman/doc/bounces.txt	2009-06-03 16:03:04 +0000
+++ lib/lp/services/mailman/doc/bounces.txt	2009-09-24 20:25:22 +0000
@@ -1,3 +1,4 @@
+=================
 Bounce processing
 =================
 
 
=== modified file 'lib/lp/services/mailman/doc/contact-address.txt'
--- lib/lp/services/mailman/doc/contact-address.txt	2009-06-26 21:58:35 +0000
+++ lib/lp/services/mailman/doc/contact-address.txt	2009-09-24 20:25:22 +0000
@@ -28,7 +28,7 @@
     >>> browser.getControl('Change').click()
 
     >>> browser.getLink('Change details').click()
-    >>> browser.getLink('Change contact address').click()
+    >>> browser.getLink('Set contact address').click()
     >>> control = browser.getControl(name='field.contact_method')
     >>> [strip_label(label) for label in control.displayValue]
     ['The Launchpad mailing list for this team...]
@@ -237,7 +237,7 @@
     >>> browser.getControl('Change').click()
 
     >>> browser.getLink('Change details').click()
-    >>> browser.getLink('Change contact address').click()
+    >>> browser.getLink('Set contact address').click()
     >>> control = browser.getControl(name='field.contact_method')
     >>> [strip_label(label) for label in control.displayValue]
     ['Each member individually']
 
=== modified file 'lib/lp/services/mailman/doc/create-lists.txt'
--- lib/lp/services/mailman/doc/create-lists.txt	2009-06-23 17:51:24 +0000
+++ lib/lp/services/mailman/doc/create-lists.txt	2009-09-24 20:25:22 +0000
@@ -21,7 +21,7 @@
 To request a mailing list, No Privileges Person navigates to the 'Configure
 mailing list' page and registers their application for a mailing list.
 
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink('Create a mailing list').click()
     >>> browser.getControl('Apply for Mailing List').click()
 
 At this point, Mailman has still not created the mailing list.
@@ -56,7 +56,7 @@
     >>> browser.getControl(name='field.subscriptionpolicy').displayValue = [
     ...     'Open Team']
     >>> browser.getControl('Create').click()
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink('Create a mailing list').click()
     >>> browser.getControl('Apply for Mailing List').click()
 
 This time, however, the mailing list expert declines the application for a new
 
=== modified file 'lib/lp/services/mailman/doc/decorations.txt'
--- lib/lp/services/mailman/doc/decorations.txt	2009-06-23 19:33:57 +0000
+++ lib/lp/services/mailman/doc/decorations.txt	2009-09-24 20:25:22 +0000
@@ -117,8 +117,7 @@
     >>> browser = Browser('[e-mail]:test')
     >>> browser.open('http://launchpad.dev:8085/~itest-one')
     >>> browser.getLink(id='mailing-list-archive')
-    <Link text='Mailing list archive'
-          url='http://lists.launchpad.dev/itest-one'>
+    <Link text='View archive' url='http://lists.launchpad.dev/itest-one'>
     >>> print message['list-archive']
     <http://lists.launchpad.dev/itest-one>
 
 
=== modified file 'lib/lp/services/mailman/doc/logging.txt'
--- lib/lp/services/mailman/doc/logging.txt	2009-04-17 10:32:16 +0000
+++ lib/lp/services/mailman/doc/logging.txt	2009-09-24 20:25:22 +0000
@@ -1,9 +1,12 @@
-= Logging and OOPS reporting =
+==========================
+Logging and OOPS reporting
+==========================
 
 The Mailman XMLRPCRunner logs errors and reports OOPSes.
 
 
-= MailmanErrorUtility =
+MailmanErrorUtility
+===================
 
 The MailmanErrorUtility is a ErrorReportingUtility that is configured
 in the [mailman] section of config.
@@ -13,21 +16,22 @@
     ...     MailmanErrorUtility)
 
     >>> error_utility = MailmanErrorUtility()
-    >>> error_utility._default_config_section
-    'mailman'
-
-    >>> error_utility.prefix
-    'TMMX'
-    >>> config.mailman.oops_prefix
-    'TMMX'
-
-    >>> error_utility.error_dir
-    '/var/tmp/mailman-xmlrpc.test'
-    >>> config.mailman.error_dir
-    '/var/tmp/mailman-xmlrpc.test'
-
-
-= Error logging =
+    >>> print error_utility._default_config_section
+    mailman
+
+    >>> print error_utility.prefix
+    TMMX
+    >>> print config.mailman.oops_prefix
+    TMMX
+
+    >>> print error_utility.error_dir
+    /var/tmp/mailman-xmlrpc.test
+    >>> print config.mailman.error_dir
+    /var/tmp/mailman-xmlrpc.test
+
+
+Error logging
+=============
 
 The log_exception() function is used by XMLRPCRunner to report known
 exceptions. It reports the OOPS.
@@ -44,12 +48,12 @@
 
     >>> test_log_exception()
     >>> oops = error_utility.getLastOopsReport()
-    >>> oops.id
-    'OOPS-...TMMX...'
-    >>> oops.type
-    'AssertionError'
-    >>> oops.value
-    'There is an OOPS in progress.'
+    >>> print oops.id
+    OOPS-...TMMX...
+    >>> print oops.type
+    AssertionError
+    >>> print oops.value
+    There is an OOPS in progress.
     >>> print oops.tb_text
     Traceback (most recent call last):
     ...
@@ -77,4 +81,3 @@
 the _create() method. The create-lists-txt test was run to generate a
 "NameError: global name 'defect' is not defined". The error was written
 to the xmlrpc log, and an OOPS was reported.
-
 
=== modified file 'lib/lp/services/mailman/doc/messages.txt'
--- lib/lp/services/mailman/doc/messages.txt	2009-04-17 10:32:16 +0000
+++ lib/lp/services/mailman/doc/messages.txt	2009-09-24 20:25:22 +0000
@@ -1,4 +1,6 @@
-= Messages =
+========
+Messages
+========
 
 Launchpad uses a custom set of message templates that it installs
 in mailman/templates/site. The installation conforms to the standard
 
=== modified file 'lib/lp/services/mailman/doc/modify-lists.txt'
--- lib/lp/services/mailman/doc/modify-lists.txt	2009-06-03 16:03:04 +0000
+++ lib/lp/services/mailman/doc/modify-lists.txt	2009-09-24 20:25:22 +0000
@@ -1,4 +1,6 @@
-= Modifying lists =
+===============
+Modifying lists
+===============
 
 A team administrator can make changes to the mailing list, although currently
 the only thing they can change is the list's welcome message.
@@ -13,7 +15,7 @@
     >>> browser.getControl(name='field.subscriptionpolicy').displayValue = [
     ...     'Open Team']
     >>> browser.getControl('Create').click()
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink('Create a mailing list').click()
     >>> browser.getControl('Apply for Mailing List').click()
 
 Before approving the creation of the mailing list, let's set the welcome
@@ -26,7 +28,7 @@
     >>> from canonical.launchpad.interfaces import (
     ...     ILaunchpadCelebrities, IMailingListSet, MailingListStatus)
 
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> list_set = getUtility(IMailingListSet)
     >>> list_one = list_set.get('itest-one')
     >>> list_one.welcome_message = 'Greetings team members!'
 
=== modified file 'lib/lp/services/mailman/doc/postings.txt'
--- lib/lp/services/mailman/doc/postings.txt	2009-06-26 21:42:20 +0000
+++ lib/lp/services/mailman/doc/postings.txt	2009-09-24 20:25:22 +0000
@@ -1,3 +1,4 @@
+=======
 Posting
 =======
 
@@ -14,7 +15,7 @@
 
 
 Non-member postings
--------------------
+===================
 
 Postings from addresses that are not registered and verified with Launchpad
 are summarily discarded.
@@ -37,7 +38,7 @@
 
 
 Non-validated member postings
------------------------------
+=============================
 
 Similarly, an address that has been registered with Launchpad but not verified
 will also be summarily discarded.  Anne registers with Launchpad but does not
@@ -48,7 +49,7 @@
     >>> from canonical.launchpad.ftests import login, logout
     >>> from canonical.launchpad.interfaces import EmailAddressStatus
 
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> anne = factory.makePersonByName('Anne')
     >>> alternative_email = get_alternative_email(anne)
 
@@ -75,7 +76,7 @@
 
 
 Unsubscribed Launchpad members
-------------------------------
+==============================
 
 Anne's preferred email address is still validated, and she posts a message
 from that address.  However, because she has not yet joined the team or
@@ -336,7 +337,7 @@
 
 
 Unsubscribed team member
-------------------------
+========================
 
 Once Anne joins the team, she may post to it, though until she subscribes to
 the mailing list, she will not get a copy of the message.
@@ -356,7 +357,7 @@
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.interfaces import IPersonSet
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> team_one = getUtility(IPersonSet).getByName('itest-one')
     >>> anne.join(team_one)
     >>> transaction.commit()
@@ -407,7 +408,7 @@
 
 
 Verified and registered member postings
----------------------------------------
+=======================================
 
 Anne now subscribes to the team's mailing list.  She gets a copy of each
 message posted to the mailing list.
@@ -503,7 +504,7 @@
 
 However, once she validates this address, she can post from it.
 
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> alternative_email.status = EmailAddressStatus.VALIDATED
     >>> logout()
     >>> transaction.commit()
@@ -570,11 +571,11 @@
 
 
 Leaving and re-joining the team
--------------------------------
+===============================
 
 Anne now leaves the team, but she does not unsubscribe from the mailing list.
 
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> team_one = getUtility(IPersonSet).getByName('itest-one')
     >>> anne.leave(team_one)
     >>> logout()
@@ -619,7 +620,7 @@
 Anne re-joins the team and once again can post to the mailing list.  She does
 not need to re-subscribe to the mailing list.
 
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> anne.join(team_one)
     >>> logout()
     >>> transaction.commit()
@@ -654,12 +655,12 @@
 
 
 First post moderation
----------------------
+=====================
 
 Normally, Launchpad members who are not subscribed to the mailing list will
 have their posts held for moderation.
 
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> bart = factory.makePersonByName('Bart')
     >>> transaction.commit()
     >>> bart.personal_standing
@@ -694,7 +695,7 @@
 list.
 
     >>> from canonical.launchpad.interfaces import PersonalStanding
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> bart.personal_standing = PersonalStanding.GOOD
     >>> transaction.commit()
 
@@ -809,7 +810,7 @@
 
 
 Preventing archiver forgeries
------------------------------
+=============================
 
 We archive messages by sending them to a special address owned by the Mail
 Archive <http://www.mail-archive.com>.  This address becomes a recipient of
@@ -834,7 +835,7 @@
 
 
 Large messages
---------------
+==============
 
 Only messages which are less than about 40k in size are allowed straight
 through on the mailing list.  A message bigger than that will be held for
 
=== modified file 'lib/lp/services/mailman/doc/reactivate-lists.txt'
--- lib/lp/services/mailman/doc/reactivate-lists.txt	2009-05-06 15:13:39 +0000
+++ lib/lp/services/mailman/doc/reactivate-lists.txt	2009-09-24 20:25:22 +0000
@@ -1,4 +1,6 @@
-= Re-activating mailing lists =
+===========================
+Re-activating mailing lists
+===========================
 
 A team administrator may re-activate a previously deactivated mailing list
 without the need for approval from a Launchpad administrator.  When the
@@ -48,7 +50,7 @@
 
 Now the team owner reactivates the list.
 
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink('Create a mailing list').click()
     >>> browser.getControl('Reactivate this Mailing List').click()
     >>> xmlrpc_watcher.wait_for_reactivation('itest-one')
 
 
=== modified file 'lib/lp/services/mailman/doc/recovery.txt'
--- lib/lp/services/mailman/doc/recovery.txt	2009-06-03 16:03:04 +0000
+++ lib/lp/services/mailman/doc/recovery.txt	2009-09-24 20:25:22 +0000
@@ -1,4 +1,6 @@
-= Error recovery =
+==============
+Error recovery
+==============
 
 Under various conditions, reporting status from Mailman to Launchpad can
 fail.  For example, if during construction, the reportStatus() call has
@@ -18,14 +20,15 @@
     >>> browser.getControl(name='field.subscriptionpolicy').displayValue = [
     ...     'Open Team']
     >>> browser.getControl('Create').click()
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink('Create a mailing list').click()
     >>> browser.getControl('Apply for Mailing List').click()
 
     >>> from lp.services.mailman.testing import helpers
     >>> list_one = helpers.review_list('itest-one')
 
 
-== Lost construction ==
+Lost construction
+=================
 
 The mailing list is now active, but let's say that the status reporting
 failed.  The mailing list would be in the CONSTRUCTING state.  We
@@ -37,7 +40,7 @@
     >>> from canonical.launchpad.interfaces import (
     ...     IMailingListSet, MailingListStatus)
     >>> from canonical.launchpad.ftests import login, logout
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> mailing_list_set = getUtility(IMailingListSet)
     >>> itest_one = removeSecurityProxy(mailing_list_set.get('itest-one'))
     >>> itest_one.status = MailingListStatus.CONSTRUCTING
@@ -84,7 +87,8 @@
     <DBItem MailingListStatus.ACTIVE, (5) Active>
 
 
-== Lost updates ==
+Lost updates
+============
 
 Another situation can occur if the team owner updates the mailing list,
 say by giving it a welcome message.
 
=== modified file 'lib/lp/services/mailman/doc/staging.txt'
--- lib/lp/services/mailman/doc/staging.txt	2009-06-30 17:37:35 +0000
+++ lib/lp/services/mailman/doc/staging.txt	2009-09-24 20:25:22 +0000
@@ -20,8 +20,7 @@
 
     >>> from canonical.launchpad.ftests import login, logout
 
-    >>> login('[e-mail]')
-    >>> from zope.component import getUtility
+    >>> login('[e-mail]')
 
     >>> owner = factory.makePerson()
     >>> team_one = factory.makeTeam(owner=owner, name='staging-one')
@@ -127,7 +126,7 @@
     >>> from canonical.launchpad.interfaces import (
     ...     EmailAddressStatus, IEmailAddressSet, IPersonSet)
     >>> from zope.component import getUtility
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> team = getUtility(IPersonSet).getByName('staging-two')
     >>> email = getUtility(IEmailAddressSet).new(
     ...     '[e-mail]', team, EmailAddressStatus.VALIDATED)
 
=== modified file 'lib/lp/services/mailman/doc/subscriptions.txt'
--- lib/lp/services/mailman/doc/subscriptions.txt	2009-06-03 16:03:04 +0000
+++ lib/lp/services/mailman/doc/subscriptions.txt	2009-09-24 20:25:22 +0000
@@ -1,4 +1,6 @@
-= Mailing list subscriptions =
+==========================
+Mailing list subscriptions
+==========================
 
 Both direct and indirect members of a team may subscribe to a team's mailing
 list.  First, create the mailing list, which will send a notification messages
@@ -57,7 +59,7 @@
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from zope.component import getUtility
 
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> person_set = getUtility(IPersonSet)
 
     >>> anne = person_set.getByName('anne')
@@ -88,7 +90,7 @@
 
 Bart now leaves the team.  His subscription is removed.
 
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> bart = person_set.getByName('bart')
     >>> team_one = person_set.getByName('itest-one')
     >>> bart.leave(team_one)
@@ -97,7 +99,8 @@
     >>> helpers.ensure_nonmembership('itest-one', bart)
 
 
-== Alternative addresses ==
+Alternative addresses
+=====================
 
 Now Anne decides to register another email address with Launchpad, however
 before she can validate this address, subscriptions for the list are
@@ -105,7 +108,7 @@
 the membership list, either as an enabled or disabled address.
 
     >>> from canonical.launchpad.interfaces import IEmailAddressSet
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> email_set = getUtility(IEmailAddressSet)
     >>> email = email_set.new(
     ...     '[e-mail]', anne, account=anne.account)
@@ -145,7 +148,8 @@
     No Privileges Person    <[e-mail]>     DISABLED
 
 
-== Case-preservation ==
+Case-preservation
+=================
 
 Mailing lists preserve the case of the subscribed email address,
 although for subscription purposes, two email addresses that differs
@@ -154,7 +158,7 @@
 Emma joins Launchpad as normal, then subscribes a mixed-case alternative
 email address.
 
-    >>> login('[e-mail]')
+    >>> login('[e-mail]')
     >>> emma = factory.makePersonByName('Emma')
     >>> email = email_set.new(
     ...     '[e-mail]', emma, account=emma.account)
 
=== modified file 'lib/lp/services/mailman/testing/helpers.py'
--- lib/lp/services/mailman/testing/helpers.py	2009-06-25 04:06:00 +0000
+++ lib/lp/services/mailman/testing/helpers.py	2009-09-24 20:25:22 +0000
@@ -103,7 +103,7 @@
         'Open Team']
     browser.getControl('Create').click()
     # Create the mailing list.
-    browser.getLink('Configure mailing list').click()
+    browser.getLink('Create a mailing list').click()
     browser.getControl('Apply for Mailing List').click()
     mailing_list = review_list(team_name)
     # pylint: disable-msg=F0401
 
=== modified file 'lib/lp/services/mailman/testing/logwatcher.py'
--- lib/lp/services/mailman/testing/logwatcher.py	2009-07-17 00:26:05 +0000
+++ lib/lp/services/mailman/testing/logwatcher.py	2009-09-24 20:25:22 +0000
@@ -33,8 +33,8 @@
 
 BREAK_ON_TIMEOUT = bool(os.getenv('BREAK_ON_TIMEOUT'))
 LINES_TO_CAPTURE = 50
-LOG_GROWTH_WAIT_INTERVAL = datetime.timedelta(seconds=20)
-FAILURE_CAPTURE_INTERVAL = datetime.timedelta(seconds=60)
+LOG_GROWTH_WAIT_INTERVAL = datetime.timedelta(seconds=10)
+FAILURE_CAPTURE_INTERVAL = datetime.timedelta(seconds=10)
 SECONDS_TO_SNOOZE = 0.1
 Empty = object()
 NL = '\n'