1 files changed, 11 insertions, 0 deletions

diff --git a/mailman/tests/test_documentation.py b/mailman/tests/test_documentation.py
index e805b10fa..2d42f989d 100644
--- a/mailman/tests/test_documentation.py
+++ b/mailman/tests/test_documentation.py
@@ -29,6 +29,7 @@ import mailman
 from mailman.Message import Message
 from mailman.app.styles import style_manager
 from mailman.configuration import config
+from mailman.testing.helpers import SMTPServer
 
 
 DOT = '.'
@@ -54,12 +55,15 @@ def specialized_message_from_string(text):
 
 def setup(testobj):
     """Test setup."""
+    smtpd = SMTPServer()
+    smtpd.start()
     # In general, I don't like adding convenience functions, since I think
     # doctests should do the imports themselves.  It makes for better
     # documentation that way.  However, a few are really useful, or help to
     # hide some icky test implementation details.
     testobj.globs['message_from_string'] = specialized_message_from_string
     testobj.globs['commit'] = config.db.commit
+    testobj.globs['smtpd'] = smtpd
 
 
 
@@ -79,6 +83,13 @@ def cleaning_teardown(testobj):
     for message in config.db.message_store.messages:
         config.db.message_store.delete_message(message['message-id'])
     config.db.commit()
+    # Reset all archivers by disabling them.
+    for archiver in config.archivers.values():
+        archiver.is_enabled = False
+    # Shutdown the smtp server.
+    smtpd = testobj.globs['smtpd']
+    smtpd.clear()
+    smtpd.stop()