Fix django-1.6 incompatibilities

[patchwork] / apps / patchwork / tests / mboxviews.py

diff --git a/apps/patchwork/tests/mboxviews.py b/apps/patchwork/tests/mboxviews.py
index e619e7b35b2014410f80615980fe9a1fc7edef2e..6209513934d176aa07cfe8fb9e9ed391a518fdea 100644 (file)
--- a/apps/patchwork/tests/mboxviews.py
+++ b/apps/patchwork/tests/mboxviews.py
@@ -21,6 +21,7 @@
 
 import unittest
 import email
+import datetime
 import dateutil.parser, dateutil.tz
 from django.test import TestCase
 from django.test.client import Client
@@ -93,6 +94,7 @@ class MboxPassThroughHeaderTest(TestCase):
 
         self.cc_header = 'Cc: CC Person <cc@example.com>'
         self.to_header = 'To: To Person <to@example.com>'
+        self.date_header = 'Date: Fri, 7 Jun 2013 15:42:54 +1000'
 
         self.patch = Patch(project = defaults.project,
                            msgid = 'p1', name = 'testpatch',
@@ -112,6 +114,13 @@ class MboxPassThroughHeaderTest(TestCase):
         response = self.client.get('/patch/%d/mbox/' % self.patch.id)
         self.assertContains(response, self.to_header)
 
+    def testDateHeader(self):
+        self.patch.headers = self.date_header + '\n'
+        self.patch.save()
+
+        response = self.client.get('/patch/%d/mbox/' % self.patch.id)
+        self.assertContains(response, self.date_header)
+
 class MboxBrokenFromHeaderTest(TestCase):
     """ Test that a person with characters outside ASCII in his name do
         produce correct From header. As RFC 2822 state we must retain the
@@ -156,3 +165,17 @@ class MboxDateHeaderTest(TestCase):
         patch_date = self.patch.date.replace(tzinfo=dateutil.tz.tzutc(),
                                             microsecond=0)
         self.assertEqual(mail_date, patch_date)
+
+    def testSuppliedDateHeader(self):
+        hour_offset = 3
+        tz = dateutil.tz.tzoffset(None, hour_offset * 60 * 60)
+        date = datetime.datetime.utcnow() - datetime.timedelta(days = 1)
+        date = date.replace(tzinfo=tz, microsecond=0)
+
+        self.patch.headers = 'Date: %s\n' % date.strftime("%a, %d %b %Y %T %z")
+        self.patch.save()
+
+        response = self.client.get('/patch/%d/mbox/' % self.patch.id)
+        mail = email.message_from_string(response.content)
+        mail_date = dateutil.parser.parse(mail['Date'])
+        self.assertEqual(mail_date, date)