[CalendarServer-changes] [8199] CalendarServer/trunk/twistedcaldav/test

[source_changes at macosforge.org]

Revision: 8199
          http://trac.macosforge.org/projects/calendarserver/changeset/8199
Author:   sagen at apple.com
Date:     2011-10-14 15:13:33 -0700 (Fri, 14 Oct 2011)
Log Message:
-----------
Make sqlite -journal files optional in unit tests.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
    CalendarServer/trunk/twistedcaldav/test/util.py

Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2011-10-14 21:22:31 UTC (rev 8198)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2011-10-14 22:13:33 UTC (rev 8199)
@@ -329,7 +329,10 @@
                 "@contents" : "2",
             },
             MailGatewayTokensDatabase.dbFilename : { "@contents" : None },
-            "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) : { "@contents" : None },
+            "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) : {
+                "@contents" : None,
+                "@optional" : True,
+            },
         }
 
         (yield self.verifyDirectoryComparison(before, after))
@@ -477,7 +480,8 @@
             },
             "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) :
             {
-                "@contents" : None
+                "@contents" : None,
+                "@optional" : True,
             },
         }
 
@@ -548,7 +552,8 @@
             },
             "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) :
             {
-                "@contents" : None
+                "@contents" : None,
+                "@optional" : True,
             },
         }
 
@@ -634,7 +639,8 @@
             },
             "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) :
             {
-                "@contents" : None
+                "@contents" : None,
+                "@optional" : True,
             },
         }
 
@@ -727,7 +733,8 @@
             },
             "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) :
             {
-                "@contents" : None
+                "@contents" : None,
+                "@optional" : True,
             },
         }
 
@@ -837,7 +844,8 @@
             },
             "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) :
             {
-                "@contents" : None
+                "@contents" : None,
+                "@optional" : True,
             },
         }
 
@@ -947,7 +955,8 @@
             },
             "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) :
             {
-                "@contents" : None
+                "@contents" : None,
+                "@optional" : True,
             },
         }
 
@@ -1074,7 +1083,8 @@
             },
             "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) :
             {
-                "@contents" : None
+                "@contents" : None,
+                "@optional" : True,
             },
         }
 
@@ -1200,7 +1210,8 @@
             },
             "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) :
             {
-                "@contents" : None
+                "@contents" : None,
+                "@optional" : True,
             },
         }
 
@@ -1293,7 +1304,8 @@
             },
             "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) :
             {
-                "@contents" : None
+                "@contents" : None,
+                "@optional" : True,
             },
         }
 
@@ -1350,7 +1362,8 @@
             },
             "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) :
             {
-                "@contents" : None
+                "@contents" : None,
+                "@optional" : True,
             },
             ResourceInfoDatabase.dbFilename :
             {
@@ -1359,6 +1372,7 @@
             "%s-journal" % (ResourceInfoDatabase.dbFilename,) :
             {
                 "@contents" : None,
+                "@optional" : True,
             }
         }
         root = self.createHierarchy(before)

Modified: CalendarServer/trunk/twistedcaldav/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/util.py	2011-10-14 21:22:31 UTC (rev 8198)
+++ CalendarServer/trunk/twistedcaldav/test/util.py	2011-10-14 22:13:33 UTC (rev 8199)
@@ -238,10 +238,12 @@
 
                 childPath = os.path.join(parent, childName)
 
-                if (not os.path.exists(childPath) and
-                    not childStructure.has_key("@optional")):
-                    print "Missing:", childPath
-                    return False
+                if not os.path.exists(childPath):
+                    if childStructure.has_key("@optional"):
+                        return True
+                    else:
+                        print "Missing:", childPath
+                        return False
 
                 if childStructure.has_key("@contents"):
                     # This is a file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111014/8189a0fd/attachment.html>