------------------------------------------------------------
revno: 6701
committer: Barry Warsaw <[email protected]>
branch nick: hacking
timestamp: Thu 2009-03-05 19:25:34 -0500
message:
  Minor cleanups
modified:
  src/mailman/docs/membership.txt
  src/mailman/docs/registration.txt
  src/mailman/testing/helpers.py

=== modified file 'src/mailman/docs/membership.txt'
--- src/mailman/docs/membership.txt     2009-02-23 02:33:17 +0000
+++ src/mailman/docs/membership.txt     2009-03-06 00:25:34 +0000
@@ -14,7 +14,7 @@
 
 When we create a mailing list, it starts out with no members...
 
-    >>> mlist = config.db.list_manager.create(u'[email protected]')
+    >>> mlist = create_list(u'[email protected]')
     >>> mlist
     <mailing list "[email protected]" at ...>
     >>> sorted(member.address.address for member in mlist.members.members)

=== modified file 'src/mailman/docs/registration.txt'
--- src/mailman/docs/registration.txt   2009-02-10 03:19:18 +0000
+++ src/mailman/docs/registration.txt   2009-03-06 00:25:34 +0000
@@ -337,7 +337,6 @@
 Fred registers with Mailman at the same time that he subscribes to a mailing
 list.
 
-    >>> from mailman.app.lifecycle import create_list
     >>> mlist = create_list(u'[email protected]')
     >>> token = registrar.register(
     ...     u'[email protected]', 'Fred Person', mlist)

=== modified file 'src/mailman/testing/helpers.py'
--- src/mailman/testing/helpers.py      2009-02-04 12:00:56 +0000
+++ src/mailman/testing/helpers.py      2009-03-06 00:25:34 +0000
@@ -36,6 +36,7 @@
 import socket
 import logging
 import smtplib
+import datetime
 import threading
 
 from Queue import Empty, Queue
@@ -46,6 +47,7 @@
 from mailman.utilities.mailbox import Mailbox
 
 
+STARTUP_WAIT = datetime.timedelta(seconds=5)
 log = logging.getLogger('mailman.debug')
 
 
@@ -239,7 +241,8 @@
     # It's possible the process has started but is not yet accepting
     # connections.  Wait a little while.
     lmtp = LMTP()
-    for attempts in range(3):
+    until = datetime.datetime.now() + STARTUP_WAIT
+    while datetime.datetime.now() < until:
         try:
             response = lmtp.connect(
                 config.mta.lmtp_host, int(config.mta.lmtp_port))
@@ -247,7 +250,7 @@
             return lmtp
         except socket.error, error:
             if error[0] == errno.ECONNREFUSED:
-                time.sleep(1)
+                time.sleep(0.5)
             else:
                 raise
     else:



--
Primary development focus
https://code.launchpad.net/~mailman-coders/mailman/3.0

Your team Mailman Checkins is subscribed to branch lp:mailman.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/3.0/+edit-subscription.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to