[CalendarServer-changes] [9347] CalendarServer/trunk/contrib/migration

[source_changes at macosforge.org]

Revision: 9347
          http://trac.macosforge.org/projects/calendarserver/changeset/9347
Author:   dre at apple.com
Date:     2012-06-08 15:56:07 -0700 (Fri, 08 Jun 2012)
Log Message:
-----------
Allow migration even if target DocumentRoot exists

Modified Paths:
--------------
    CalendarServer/trunk/contrib/migration/calendarmigrator.py
    CalendarServer/trunk/contrib/migration/test/test_migrator.py

Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarmigrator.py	2012-06-08 22:54:11 UTC (rev 9346)
+++ CalendarServer/trunk/contrib/migration/calendarmigrator.py	2012-06-08 22:56:07 UTC (rev 9347)
@@ -768,7 +768,10 @@
         return contents
 
     def mkdir(self, path):
-        return os.mkdir(path)
+        if not self.exists(path):
+            return os.mkdir(path)
+        else:
+            return
 
     def rename(self, before, after):
         log("Renaming: %s to %s" % (before, after))

Modified: CalendarServer/trunk/contrib/migration/test/test_migrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/test/test_migrator.py	2012-06-08 22:54:11 UTC (rev 9346)
+++ CalendarServer/trunk/contrib/migration/test/test_migrator.py	2012-06-08 22:56:07 UTC (rev 9347)
@@ -1473,6 +1473,20 @@
             self.assertEquals(expected, relativize(*args))
 
 
+    def test_createExistingDirectory(self):
+        import os
+        t = self.mktemp()
+        os.mkdir(t)
+        da = contrib.migration.calendarmigrator.DiskAccessor()
+        self.assertEquals(da.mkdir(t), None)
+
+
+    def test_createDirectory(self):
+        t = self.mktemp()
+        da = contrib.migration.calendarmigrator.DiskAccessor()
+        self.assertEquals(da.mkdir(t), None)
+
+
 class StubDiskAccessor(object):
     """
     A stub which allows testing without actually having real files
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120608/cc20cd28/attachment-0001.html>