[CalendarServer-changes] [5344] CalendarServer/trunk/calendarserver/tools/test/test_purge.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 17 11:54:06 PDT 2010


Revision: 5344
          http://trac.macosforge.org/projects/calendarserver/changeset/5344
Author:   sagen at apple.com
Date:     2010-03-17 11:54:05 -0700 (Wed, 17 Mar 2010)
Log Message:
-----------
When testing purge, only examine the calendars directory

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/test/test_purge.py

Modified: CalendarServer/trunk/calendarserver/tools/test/test_purge.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_purge.py	2010-03-17 18:52:28 UTC (rev 5343)
+++ CalendarServer/trunk/calendarserver/tools/test/test_purge.py	2010-03-17 18:54:05 UTC (rev 5344)
@@ -83,33 +83,33 @@
         self.assertEquals(count, 2)
 
         after = {
-            "addressbooks" : {}, # FIXME
-            "calendars" : {
-                "__uids__" : {
-                    "64" : {
-                        "23" : {
-                            "6423F94A-6B76-4A3A-815B-D52CFD77935D" : {
-                                "calendar": {
-                                    ".db.sqlite": {
-                                        "@contents" : None, # ignore contents
-                                    },
-                                    "endless.ics": {
-                                        "@contents" : ENDLESS_ICS,
-                                    },
-                                    "straddling.ics": {
-                                        "@contents" : STRADDLING_ICS,
-                                    },
-                                    "recent.ics": {
-                                        "@contents" : RECENT_ICS,
-                                    },
+            "__uids__" : {
+                "64" : {
+                    "23" : {
+                        "6423F94A-6B76-4A3A-815B-D52CFD77935D" : {
+                            "calendar": {
+                                ".db.sqlite": {
+                                    "@contents" : None, # ignore contents
                                 },
+                                "endless.ics": {
+                                    "@contents" : ENDLESS_ICS,
+                                },
+                                "straddling.ics": {
+                                    "@contents" : STRADDLING_ICS,
+                                },
+                                "recent.ics": {
+                                    "@contents" : RECENT_ICS,
+                                },
                             },
                         },
                     },
                 },
             },
         }
-        self.assertTrue(self.verifyHierarchy(config.DocumentRoot, after))
+        self.assertTrue(self.verifyHierarchy(
+            os.path.join(config.DocumentRoot, "calendars"),
+            after)
+        )
 
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100317/3d16cf24/attachment.html>


More information about the calendarserver-changes mailing list