[CalendarServer-changes] [6371] CalendarServer/branches/users/glyph/more-deferreds-7/txdav/caldav/ datastore/test/common.py

[source_changes at macosforge.org]

Revision: 6371
          http://trac.macosforge.org/projects/calendarserver/changeset/6371
Author:   glyph at apple.com
Date:     2010-09-24 00:11:41 -0700 (Fri, 24 Sep 2010)
Log Message:
-----------
calendarObjectWithName

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/more-deferreds-7/txdav/caldav/datastore/test/common.py

Modified: CalendarServer/branches/users/glyph/more-deferreds-7/txdav/caldav/datastore/test/common.py
===================================================================
--- CalendarServer/branches/users/glyph/more-deferreds-7/txdav/caldav/datastore/test/common.py	2010-09-24 06:10:56 UTC (rev 6370)
+++ CalendarServer/branches/users/glyph/more-deferreds-7/txdav/caldav/datastore/test/common.py	2010-09-24 07:11:41 UTC (rev 6371)
@@ -501,7 +501,7 @@
         for calendarObject in calendarObjects:
             self.assertProvides(ICalendarObject, calendarObject)
             self.assertEquals(
-                calendar1.calendarObjectWithName(calendarObject.name()),
+                (yield calendar1.calendarObjectWithName(calendarObject.name())),
                 calendarObject
             )
 
@@ -575,7 +575,7 @@
                 None
             )
             self.assertEquals(
-                calendar.calendarObjectWithName(name),
+                (yield calendar.calendarObjectWithName(name)),
                 None
             )
 
@@ -601,11 +601,11 @@
         calendar = yield self.calendarUnderTest()
         for name in calendar1_objectNames:
             self.assertNotIdentical(
-                calendar.calendarObjectWithName(name), None
+                (yield calendar.calendarObjectWithName(name)), None
             )
             calendar.removeCalendarObjectWithName(name)
             self.assertIdentical(
-                calendar.calendarObjectWithName(name), None
+                (yield calendar.calendarObjectWithName(name)), None
             )
 
 
@@ -749,11 +749,11 @@
         """
         calendar1 = yield self.calendarUnderTest()
         name = "4.ics"
-        self.assertIdentical(calendar1.calendarObjectWithName(name), None)
+        self.assertIdentical((yield calendar1.calendarObjectWithName(name)), None)
         component = VComponent.fromString(event4_text)
         calendar1.createCalendarObjectWithName(name, component)
 
-        calendarObject = calendar1.calendarObjectWithName(name)
+        calendarObject = yield calendar1.calendarObjectWithName(name)
         self.assertEquals(calendarObject.component(), component)
 
         yield self.commit()
@@ -869,7 +869,7 @@
         self.assertEquals(calendarObject.component(), component)
 
         # Also check a new instance
-        calendarObject = calendar1.calendarObjectWithName("1.ics")
+        calendarObject = yield calendar1.calendarObjectWithName("1.ics")
         self.assertEquals(calendarObject.component(), component)
 
         yield self.commit()
@@ -1044,7 +1044,7 @@
         yield self.commit()
         home = yield self.homeUnderTest()
         cal = yield self.calendarUnderTest()
-        fromName = cal.calendarObjectWithName(objName)
+        fromName = yield cal.calendarObjectWithName(objName)
         fromDropbox = home.calendarObjectWithDropboxID("some-dropbox-id")
         self.assertEquals(fromName, fromDropbox)
 
@@ -1198,9 +1198,9 @@
             (yield (yield home2.calendarWithName("calendar")).calendarObjects()))
         self.assertEquals(objects, [])
         for resourceName in self.requirements['home1']['calendar_1'].keys():
-            obj = calendar1.calendarObjectWithName(resourceName)
+            obj = yield calendar1.calendarObjectWithName(resourceName)
             self.assertIdentical(
-                calendar2.calendarObjectWithName(resourceName), None)
+                (yield calendar2.calendarObjectWithName(resourceName)), None)
             self.assertIdentical(
                 calendar2.calendarObjectWithUID(obj.uid()), None)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100924/5d71576c/attachment.html>