From bf99c6b69d0f4371b4d47ceca5bf525cb28765a3 Mon Sep 17 00:00:00 2001
From: Nikolaus Schulz <microschulz@web.de>
Date: Tue, 30 Sep 2008 13:12:13 +0200
Subject: [PATCH] test suite: cut down archive suffix generation testing

Don't do entire test archiving runs, just call
archivemail.make_archive_name() and verify the result.
---
 test_archivemail.py | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/test_archivemail.py b/test_archivemail.py
index a5f7c21..c4b1f00 100755
--- a/test_archivemail.py
+++ b/test_archivemail.py
@@ -766,37 +766,28 @@ class TestArchiveMboxPreserveStatus(TestCaseInTempdir):
         super(TestArchiveMboxPreserveStatus, self).tearDown()
 
 
-class TestArchiveMboxSuffix(TestCaseInTempdir):
+class TestArchiveMboxSuffix(unittest.TestCase):
     """make sure the 'suffix' option works"""
     def setUp(self):
-        super(TestArchiveMboxSuffix, self).setUp()
+        self.old_suffix = archivemail.options.archive_suffix
         archivemail.options.quiet = 1
 
     def testSuffix(self):
         """archiving with specified --suffix arguments"""
         for suffix in ("_static_", "_%B_%Y", "-%Y-%m-%d"):
-            days_old_max = 180
-            self.mbox_name = make_mbox(messages=3,
-                hours_old=(24 * (days_old_max+1)))
-            self.copy_name = tempfile.mkstemp()[1]
-            shutil.copyfile(self.mbox_name, self.copy_name)
+            mbox_name = "foobar"
             archivemail.options.archive_suffix = suffix
-            archivemail.archive(self.mbox_name)
-            assert(os.path.exists(self.mbox_name))
-            self.assertEqual(os.path.getsize(self.mbox_name), 0)
-
+            days_old_max = 180
             parsed_suffix_time = time.time() - days_old_max*24*60*60
             parsed_suffix = time.strftime(suffix,
                 time.localtime(parsed_suffix_time))
-
-            archive_name = self.mbox_name + parsed_suffix + ".gz"
-            assertEqualContent(archive_name, self.copy_name, zipfirst=True)
-            os.remove(archive_name)
+            archive_name = mbox_name + parsed_suffix
+            self.assertEqual(archive_name,
+                    archivemail.make_archive_name(mbox_name))
 
     def tearDown(self):
         archivemail.options.quiet = 0
-        archivemail.options.archive_suffix = "_archive"
-        super(TestArchiveMboxSuffix, self).tearDown()
+        archivemail.options.archive_suffix = self.old_suffix
 
 
 class TestArchiveDryRun(TestCaseInTempdir):