fix test, don't delete default collections on merge

git-svn-id: https://svn.calendarserver.org/repository/calendarserver/CalendarServer/branches/users/glyph/migrate-merge@8704 e27351fd-9f3e-4f54-a53b-843176b1656c
apple · Feb 16, 2012 · 1202909 · 1202909
1 parent e94c20d
commit 1202909
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/txdav/caldav/datastore/util.py b/txdav/caldav/datastore/util.py
@@ -319,10 +319,12 @@ def migrateHome(inHome, outHome, getComponent=lambda x: x.component(),
     @return: a L{Deferred} that fires with C{None} when the migration is
         complete.
     """
-    yield outHome.removeCalendarWithName("calendar")
-    if config.RestrictCalendarsToOneComponentType:
-        yield outHome.removeCalendarWithName("tasks")
-    yield outHome.removeCalendarWithName("inbox")
+    if not merge:
+        yield outHome.removeCalendarWithName("calendar")
+        if config.RestrictCalendarsToOneComponentType:
+            yield outHome.removeCalendarWithName("tasks")
+        yield outHome.removeCalendarWithName("inbox")
+
     outHome.properties().update(inHome.properties())
     inCalendars = yield inHome.calendars()
     for calendar in inCalendars: