Index: test_email.py
===================================================================
RCS file: /cvsroot/mimelib/mimelib/tests/test_email.py,v
retrieving revision 1.37
diff -u -r1.37 test_email.py
--- test_email.py	8 Apr 2002 05:03:15 -0000	1.37
+++ test_email.py	8 Apr 2002 06:14:47 -0000
@@ -1175,34 +1175,15 @@
                                'quopriMIME'])
 
     def test_formatdate(self):
-        now = 1005327232.109884
-        epoch = time.gmtime(0)[0]
-        # When does the epoch start?
-        if epoch == 1970:
-            # traditional Unix epoch
-            matchdate = 'Fri, 09 Nov 2001 17:33:52 -0000'
-        elif epoch == 1904:
-            # Mac epoch
-            matchdate = 'Sat, 09 Nov 1935 16:33:52 -0000'
-        else:
-            matchdate = "I don't understand your epoch"
-        gdate = Utils.formatdate(now)
-        self.assertEqual(gdate, matchdate)
+        now = time.time()
+        self.assertEqual(Utils.parsedate(Utils.formatdate(now))[:7],
+                         time.gmtime(now)[:7])
 
     def test_formatdate_localtime(self):
-        now = 1005327232.109884
-        ldate = Utils.formatdate(now, localtime=1)
-        zone = ldate.split()[5]
-        offset = int(zone[1:3]) * 3600 + int(zone[-2:]) * 60
-        # Remember offset is in seconds west of UTC, but the timezone is in
-        # minutes east of UTC, so the signs differ.
-        if zone[0] == '+':
-            offset = -offset
-        if time.daylight and time.localtime(now)[-1]:
-            toff = time.altzone
-        else:
-            toff = time.timezone
-        self.assertEqual(offset, toff)
+        now = time.time()
+        self.assertEqual(
+            Utils.parsedate(Utils.formatdate(now, localtime=1))[:7],
+            time.localtime(now)[:7])
 
     def test_parsedate_none(self):
         self.assertEqual(Utils.parsedate(''), None)