From 08a840ca7d3c96dc2c40dad90d64d90fa56e1021 Mon Sep 17 00:00:00 2001 From: C Robert Date: Fri, 2 Oct 2009 13:51:21 +0000 Subject: [PATCH] Fixed locale issue for date tests Monotone-Parent: 8169d785eb4b1db08ba796bd05e7ca01e2497f49 Monotone-Revision: 7364cc475f410932b1e40c6ff6e9d7d8210c29b3 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-10-02T13:51:21 Monotone-Branch: ca.inverse.sogo --- Tests/test-maildav.py | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/Tests/test-maildav.py b/Tests/test-maildav.py index fb630a35b..d81f76030 100755 --- a/Tests/test-maildav.py +++ b/Tests/test-maildav.py @@ -100,7 +100,7 @@ class DAVMailCollectionTest(unittest.TestCase): " expected status code '%d' (received '%d')" % (filename, exp_status, put.response["status"])) - def _testProperty (self, url, property, expected): + def _testProperty (self, url, property, expected, isDate = 0): propfind = webdavlib.WebDAVPROPFIND(url, (property, ), 0) self.client.execute(propfind) key = property.replace("{urn:schemas:httpmail:}", "a:") @@ -113,6 +113,10 @@ class DAVMailCollectionTest(unittest.TestCase): result = prop._get_firstChild()._get_nodeValue() #print key, result + if isDate: + tstruct = time.strptime (result, "%a, %d %b %Y %H:%M:%S %Z") + result = int (time.mktime (tstruct)) + self.assertEquals(result, expected, "failure in propfind" "(%s != %s)" % (result, expected)) @@ -191,25 +195,26 @@ class DAVMailCollectionTest(unittest.TestCase): "(code = %d)" % put.response["status"]) itemLocation = put.response["headers"]["location"] - tests = (("{urn:schemas:httpmail:}date", "Tue, 29 Sep 2009 11:42:14 GMT"), - ("{urn:schemas:httpmail:}hasattachment", "0"), - ("{urn:schemas:httpmail:}read", "0"), + tests = (("{urn:schemas:httpmail:}date", 1254242534, 1), + ("{urn:schemas:httpmail:}hasattachment", "0", 0), + ("{urn:schemas:httpmail:}read", "0", 0), ("{urn:schemas:httpmail:}textdescription", - "" % message1), - ("{urn:schemas:httpmail:}unreadcount", None), - ("{urn:schemas:mailheader:}cc","support@inverse.ca, user10@cyril.dev"), - ("{urn:schemas:mailheader:}date", "Tue, 29 Sep 2009 11:42:14 GMT"), - ("{urn:schemas:mailheader:}from", "Cyril "), - ("{urn:schemas:mailheader:}in-reply-to", None), - ("{urn:schemas:mailheader:}message-id","<4AC1F296.5060801@cyril.dev>"), - ("{urn:schemas:mailheader:}received", message1_received), - ("{urn:schemas:mailheader:}references", "<4AC3BF1B.3010806@inverse.ca>"), - ("{urn:schemas:mailheader:}subject", "Hallo"), - ("{urn:schemas:mailheader:}to", "jacques@cyril.dev")) + "" % message1, 0), + ("{urn:schemas:httpmail:}unreadcount", None, 0), + ("{urn:schemas:mailheader:}cc","support@inverse.ca, user10@cyril.dev", 0), + ("{urn:schemas:mailheader:}date", 1254242534, 1), + ("{urn:schemas:mailheader:}from", "Cyril ", 0), + ("{urn:schemas:mailheader:}in-reply-to", None, 0), + ("{urn:schemas:mailheader:}message-id","<4AC1F296.5060801@cyril.dev>", 0), + ("{urn:schemas:mailheader:}received", message1_received, 0), + ("{urn:schemas:mailheader:}references", + "<4AC3BF1B.3010806@inverse.ca>", 0), + ("{urn:schemas:mailheader:}subject", "Hallo", 0), + ("{urn:schemas:mailheader:}to", "jacques@cyril.dev", 0)) for test in tests: - property, expected = test - self._testProperty(itemLocation, property, expected) + property, expected, isDate = test + self._testProperty(itemLocation, property, expected, isDate) self._deleteCollection ("test-dav-mail")