Added a buildout hack for zope.testing so that we can add our own command line

options to bin/test.

More test repair, even though it's cheating.  Use a bunch of variables from
Defaults.py even though these will have to be moved to the schema.cfg.

Update logging initialization to consult the propagate flag from the command
line.  Also skip mailman.root since this is not a valid logger.

1 files changed, 5 insertions, 5 deletions

diff --git a/mailman/pipeline/to_outgoing.py b/mailman/pipeline/to_outgoing.py
index d8d1ec935..bbaf43301 100644
--- a/mailman/pipeline/to_outgoing.py
+++ b/mailman/pipeline/to_outgoing.py
@@ -28,10 +28,10 @@ __all__ = ['ToOutgoing']
 
 from zope.interface import implements
 
+from mailman import Defaults
 from mailman.config import config
 from mailman.i18n import _
 from mailman.interfaces import IHandler, Personalization
-from mailman.queue import Switchboard
 
 
 
@@ -45,7 +45,7 @@ class ToOutgoing:
 
     def process(self, mlist, msg, msgdata):
         """See `IHandler`."""
-        interval = config.VERP_DELIVERY_INTERVAL
+        interval = Defaults.VERP_DELIVERY_INTERVAL
         # Should we VERP this message?  If personalization is enabled for this
         # list and VERP_PERSONALIZED_DELIVERIES is true, then yes we VERP it.
         # Also, if personalization is /not/ enabled, but
@@ -57,7 +57,7 @@ class ToOutgoing:
         if 'verp' in  msgdata:
             pass
         elif mlist.personalize <> Personalization.none:
-            if config.VERP_PERSONALIZED_DELIVERIES:
+            if Defaults.VERP_PERSONALIZED_DELIVERIES:
                 msgdata['verp'] = True
         elif interval == 0:
             # Never VERP
@@ -69,5 +69,5 @@ class ToOutgoing:
             # VERP every `interval' number of times
             msgdata['verp'] = not (int(mlist.post_id) % interval)
         # And now drop the message in qfiles/out
-        outq = Switchboard(config.OUTQUEUE_DIR)
-        outq.enqueue(msg, msgdata, listname=mlist.fqdn_listname)
+        config.switchboards['out'].enqueue(
+            msg, msgdata, listname=mlist.fqdn_listname)