[CalendarServer-changes] [11865] CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades

[source_changes at macosforge.org]

Revision: 11865
          http://trac.calendarserver.org//changeset/11865
Author:   cdaboo at apple.com
Date:     2013-10-31 18:16:18 -0700 (Thu, 31 Oct 2013)
Log Message:
-----------
Fix bug in incremental upgrade changes.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py
    CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_4_to_5.py

Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py	2013-10-31 23:15:54 UTC (rev 11864)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py	2013-11-01 01:16:18 UTC (rev 11865)
@@ -105,7 +105,7 @@
     prop = inbox.properties().get(PropertyName.fromElement(customxml.CalendarAvailability))
     if prop is not None:
         yield home.setAvailability(prop.calendar())
-        del inbox.properties()[customxml.CalendarAvailability]
+        del inbox.properties()[PropertyName.fromElement(customxml.CalendarAvailability)]
 
 
 

Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_4_to_5.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_4_to_5.py	2013-10-31 23:15:54 UTC (rev 11864)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_4_to_5.py	2013-11-01 01:16:18 UTC (rev 11865)
@@ -161,7 +161,10 @@
                 self.assertEqual(version, 4)
                 calendar = (yield self.calendarUnderTest(name=calname, home=user))
                 self.assertEqual(calendar.getTimezone(), None)
-                self.assertTrue(PropertyName.fromElement(caldavxml.CalendarTimeZone) in calendar.properties())
+                if tz:
+                    self.assertTrue(PropertyName.fromElement(caldavxml.CalendarTimeZone) in calendar.properties())
+                else:
+                    self.assertTrue(PropertyName.fromElement(caldavxml.CalendarTimeZone) not in calendar.properties())
 
 
     @inlineCallbacks
@@ -272,7 +275,10 @@
                 self.assertEqual(version, 4)
                 calendar = (yield self.calendarUnderTest(name="inbox", home=user))
                 self.assertEqual(home.getAvailability(), None)
-                self.assertTrue(PropertyName.fromElement(customxml.CalendarAvailability) in calendar.properties())
+                if av:
+                    self.assertTrue(PropertyName.fromElement(customxml.CalendarAvailability) in calendar.properties())
+                else:
+                    self.assertTrue(PropertyName.fromElement(customxml.CalendarAvailability) not in calendar.properties())
 
 
     @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/24b2c2a2/attachment.html>