[CalendarServer-changes] [5736] CalendarServer/branches/new-store/twistedcaldav/test/test_wrapping. py

[source_changes at macosforge.org]

Revision: 5736
          http://trac.macosforge.org/projects/calendarserver/changeset/5736
Author:   glyph at apple.com
Date:     2010-06-15 11:04:25 -0700 (Tue, 15 Jun 2010)
Log Message:
-----------
Commit transaction before comparing paths, so as not to be confused by temporary directories.

Modified Paths:
--------------
    CalendarServer/branches/new-store/twistedcaldav/test/test_wrapping.py

Modified: CalendarServer/branches/new-store/twistedcaldav/test/test_wrapping.py
===================================================================
--- CalendarServer/branches/new-store/twistedcaldav/test/test_wrapping.py	2010-06-15 18:03:52 UTC (rev 5735)
+++ CalendarServer/branches/new-store/twistedcaldav/test/test_wrapping.py	2010-06-15 18:04:25 UTC (rev 5736)
@@ -91,10 +91,19 @@
         segments = path.split("/")
         resource = self.site.resource
         while segments:
-            resource, segments = yield resource.locateChild(None, segments)
+            resource, segments = yield resource.locateChild(self, segments)
         returnValue(resource)
 
 
+    def commit(self):
+        """
+        Since C{getResource} treats this test case as a resource, it will have
+        an associated transaction.  Commit that transaction to bring the
+        filesystem into a consistent state.
+        """
+        self._newStoreTransaction.commit()
+
+
     def test_createStore(self):
         """
         Creating a CalendarHomeProvisioningFile will create a paired
@@ -113,6 +122,7 @@
         via C{newTransaction().calendarHomeWithUID}.
         """
         calDavFile = yield self.getResource("calendars/users/wsanchez/")
+        self.commit()
         self.assertEquals(calDavFile.fp, calDavFile._newStoreCalendarHome._path)
         self.assertIsInstance(calDavFile._newStoreCalendarHome, CalendarHome)
 
@@ -125,6 +135,7 @@
         create a corresponding L{Calendar} via C{CalendarHome.calendarWithName}.
         """
         calDavFile = yield self.getResource("calendars/users/wsanchez/calendar")
+        self.commit()
         self.assertEquals(calDavFile.fp, calDavFile._newStoreCalendar._path)
 
 
@@ -140,6 +151,7 @@
         calDavFile = yield self.getResource("calendars/users/wsanchez/frobozz")
         self.assertIsInstance(calDavFile, ProtoCalendarCollectionFile)
         calDavFile.createCalendarCollection()
+        self.commit()
         self.assertEquals(calDavFile.fp, calDavFile._newStoreCalendar._path)
 
 
@@ -171,6 +183,7 @@
         calDavFileCalendar = yield self.getResource(
             "calendars/users/wsanchez/calendar/1.ics"
         )
+        self.commit()
         self.assertEquals(calDavFileCalendar._newStoreObject._path, 
                           calDavFileCalendar.fp)
         self.assertEquals(calDavFileCalendar._principalCollections,
@@ -187,5 +200,6 @@
         calDavFileCalendar = yield self.getResource(
             "calendars/users/wsanchez/calendar/xyzzy.ics"
         )
+        self.commit()
         self.assertEquals(calDavFileCalendar._principalCollections,
                           frozenset([self.principalsResource]))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100615/55267212/attachment.html>