Merge smtp_direct.py rework branch.

1 files changed, 3 insertions, 17 deletions

diff --git a/src/mailman/testing/layers.py b/src/mailman/testing/layers.py
index d4db9ebf2..4bc98161e 100644
--- a/src/mailman/testing/layers.py
+++ b/src/mailman/testing/layers.py
@@ -35,7 +35,6 @@ import logging
 import datetime
 import tempfile
 
-from lazr.smtptest.controller import QueueController
 from pkg_resources import resource_string
 from textwrap import dedent
 from urllib2 import urlopen, URLError
@@ -48,6 +47,7 @@ from mailman.i18n import _
 from mailman.interfaces.domain import IDomainManager
 from mailman.interfaces.messages import IMessageStore
 from mailman.testing.helpers import TestableMaster
+from mailman.testing.mta import ConnectionCountingController
 from mailman.utilities.datetime import factory
 from mailman.utilities.string import expand
 
@@ -210,20 +210,6 @@ class ConfigLayer(MockAndMonkeyLayer):
 
 
 
-class ExtendedQueueController(QueueController):
-    """QueueController with a little extra API."""
-
-    @property
-    def messages(self):
-        """Return all the messages received by the SMTP server."""
-        for message in self:
-            yield message
-
-    def clear(self):
-        """Clear all the messages from the queue."""
-        list(self)
-
-
 class SMTPLayer(ConfigLayer):
     """Layer for starting, stopping, and accessing a test SMTP server."""
 
@@ -234,7 +220,7 @@ class SMTPLayer(ConfigLayer):
         assert cls.smtpd is None, 'Layer already set up'
         host = config.mta.smtp_host
         port = int(config.mta.smtp_port)
-        cls.smtpd = ExtendedQueueController(host, port)
+        cls.smtpd = ConnectionCountingController(host, port)
         cls.smtpd.start()
 
     @classmethod
@@ -249,7 +235,7 @@ class SMTPLayer(ConfigLayer):
 
     @classmethod
     def testTearDown(cls):
-        pass
+        cls.smtpd.clear()