2 files changed, 32 insertions, 14 deletions
diff --git a/Mailman/testing/test_after_delivery.py b/Mailman/testing/test_after_delivery.py
new file mode 100644
index 000000000..0abad5d6e
--- /dev/null
+++ b/Mailman/testing/test_after_delivery.py
@@ -0,0 +1,32 @@
+# Copyright (C) 2007 by the Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
+"""Doctest harness for testing booking done after message delivery."""
+
+import doctest
+import unittest
+
+options = (doctest.ELLIPSIS
+           | doctest.NORMALIZE_WHITESPACE
+           | doctest.REPORT_NDIFF)
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(doctest.DocFileSuite('../docs/after-delivery.txt',
+                                       optionflags=options))
+    return suite
diff --git a/Mailman/testing/test_handlers.py b/Mailman/testing/test_handlers.py
index a0a196dae..9c236584f 100644
--- a/Mailman/testing/test_handlers.py
+++ b/Mailman/testing/test_handlers.py
@@ -62,18 +62,6 @@ def password(cleartext):
 
 
 
-class TestAfterDelivery(TestBase):
-    # Both msg and msgdata are ignored
-    def test_process(self):
-        mlist = self._mlist
-        last_post_time = mlist.last_post_time
-        post_id = mlist.post_id
-        AfterDelivery.process(mlist, None, None)
-        self.failUnless(mlist.last_post_time > last_post_time)
-        self.assertEqual(mlist.post_id, post_id + 1)
-
-
-
 class TestApprove(TestBase):
     def test_short_circuit(self):
         msgdata = {'approved': 1}
@@ -1571,8 +1559,6 @@ Mailman rocks!
 
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestAcknowledge))
-    suite.addTest(unittest.makeSuite(TestAfterDelivery))
     suite.addTest(unittest.makeSuite(TestApprove))
     suite.addTest(unittest.makeSuite(TestCalcRecips))
     suite.addTest(unittest.makeSuite(TestCleanse))