[CalendarServer-changes] [9186] CalendarServer/trunk/txdav/caldav/datastore

[source_changes at macosforge.org]

Revision: 9186
          http://trac.macosforge.org/projects/calendarserver/changeset/9186
Author:   cdaboo at apple.com
Date:     2012-04-26 09:16:17 -0700 (Thu, 26 Apr 2012)
Log Message:
-----------
Handle RECURRENCE-MAX is None case.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/sql.py
    CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2012-04-26 02:12:55 UTC (rev 9185)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2012-04-26 16:16:17 UTC (rev 9186)
@@ -1047,7 +1047,7 @@
             yield self._recurrenceMaxByIDQuery.on(txn,
                                          resourceID=self._resourceID)
         )[0][0]
-        returnValue(parseSQLDateToPyCalendar(rMax))
+        returnValue(parseSQLDateToPyCalendar(rMax) if rMax is not None else None)
 
 
     @inlineCallbacks

Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py	2012-04-26 02:12:55 UTC (rev 9185)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py	2012-04-26 16:16:17 UTC (rev 9186)
@@ -1168,4 +1168,18 @@
             self.fail("Expected an exception")
         self.assertFalse(resource2._locked)
 
+
+    @inlineCallbacks
+    def test_recurrenceMax(self):
+        """
+        Test CalendarObjectResource.recurrenceMax to make sure it handles a None value.
+        """
+        
+        # Valid object
+        resource = yield self.calendarObjectUnderTest()
+        
+        # Valid lock
+        rMax = yield resource.recurrenceMax()
+        self.assertEqual(rMax, None)
+
         
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120426/9056b7c5/attachment.html>