From ca6bbd0ef9dfa503f2cbbcc65cf25e695c0b78ec Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Wed, 11 Jul 2007 07:06:34 -0400
Subject: Convert ToArchive tests to doctests and do a minimal amount of
 handler module cleanup (really, not much was necessary).

---
 Mailman/testing/test_handlers.py | 57 ----------------------------------------
 1 file changed, 57 deletions(-)

(limited to 'Mailman/testing')

diff --git a/Mailman/testing/test_handlers.py b/Mailman/testing/test_handlers.py
index aa7ac0dae..e183f3b66 100644
--- a/Mailman/testing/test_handlers.py
+++ b/Mailman/testing/test_handlers.py
@@ -42,7 +42,6 @@ from Mailman.Handlers import Approve
 from Mailman.Handlers import Moderate
 from Mailman.Handlers import Scrubber
 # Don't test handlers such as SMTPDirect and Sendmail here
-from Mailman.Handlers import ToArchive
 
 
 
@@ -218,65 +217,9 @@ An embedded and charset-unspecified text was scrubbed...
 Name: xtext.txt""")
 
 
-
-class TestToArchive(TestBase):
-    def setUp(self):
-        TestBase.setUp(self)
-        # We're going to want to inspect this queue directory
-        self._sb = Switchboard(config.ARCHQUEUE_DIR)
-
-    def tearDown(self):
-        for f in os.listdir(config.ARCHQUEUE_DIR):
-            os.unlink(os.path.join(config.ARCHQUEUE_DIR, f))
-        TestBase.tearDown(self)
-
-    def test_short_circuit(self):
-        eq = self.assertEqual
-        msgdata = {'isdigest': 1}
-        ToArchive.process(self._mlist, None, msgdata)
-        eq(len(self._sb.files()), 0)
-        # Try the other half of the or...
-        self._mlist.archive = 0
-        ToArchive.process(self._mlist, None, msgdata)
-        eq(len(self._sb.files()), 0)
-        # Now try the various message header shortcuts
-        msg = email.message_from_string("""\
-X-No-Archive: YES
-
-""")
-        self._mlist.archive = 1
-        ToArchive.process(self._mlist, msg, {})
-        eq(len(self._sb.files()), 0)
-        # And for backwards compatibility
-        msg = email.message_from_string("""\
-X-Archive: NO
-
-""")
-        ToArchive.process(self._mlist, msg, {})
-        eq(len(self._sb.files()), 0)
-
-    def test_normal_archiving(self):
-        eq = self.assertEqual
-        msg = email.message_from_string("""\
-Subject: About Mailman
-
-It rocks!
-""")
-        ToArchive.process(self._mlist, msg, {})
-        files = self._sb.files()
-        eq(len(files), 1)
-        msg2, data = self._sb.dequeue(files[0])
-        eq(len(data), 3)
-        eq(data['version'], 3)
-        # Clock skew makes this unreliable
-        #self.failUnless(data['received_time'] <= time.time())
-        eq(msg.as_string(unixfrom=0), msg2.as_string(unixfrom=0))
-
-
 
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(TestApprove))
     suite.addTest(unittest.makeSuite(TestScrubber))
-    suite.addTest(unittest.makeSuite(TestToArchive))
     return suite
-- 
cgit v1.3.1