[CalendarServer-changes] [8694] CalendarServer/branches/users/glyph/migrate-merge

source_changes at macosforge.org source_changes at macosforge.org
Thu Feb 16 04:28:41 PST 2012


Revision: 8694
          http://trac.macosforge.org/projects/calendarserver/changeset/8694
Author:   glyph at apple.com
Date:     2012-02-16 04:28:41 -0800 (Thu, 16 Feb 2012)
Log Message:
-----------
Work around test failure due to (over?)-zealous default calendar provisioning.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/migrate-merge/

Modified: CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py
===================================================================
--- CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py	2012-02-16 12:28:38 UTC (rev 8693)
+++ CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py	2012-02-16 12:28:41 UTC (rev 8694)
@@ -326,10 +326,17 @@
     @inlineCallbacks
     def test_migrateEmptyHome(self):
         """
-        Migrating an empty home into an existing home should destroy all the existing home's calendars.
+        Migrating an empty home into an existing home should destroy all the
+        existing home's calendars.
         """
         yield populateCalendarsFrom({
-            "empty_home": {},
+            "empty_home": {
+                # Some of the upgrade logic will ensure that sufficient default
+                # calendars exist for basic usage, so this home is actually only
+                # *mostly* empty; the important thing is that the default
+                # calendar is removed.
+                "other-default-calendar": {}
+            },
             "non_empty_home": {
                 "calendar": {},
                 "inbox": {},
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120216/32a76951/attachment-0001.html>


More information about the calendarserver-changes mailing list