[CalendarServer-changes] [10719] CalendarServer/branches/users/gaya/sharedgroups

[source_changes at macosforge.org]

Revision: 10719
          http://trac.calendarserver.org//changeset/10719
Author:   gaya at apple.com
Date:     2013-02-13 17:30:18 -0800 (Wed, 13 Feb 2013)
Log Message:
-----------
use new shareWith()

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/calendarserver/tools/test/test_purge.py
    CalendarServer/branches/users/gaya/sharedgroups/txdav/caldav/datastore/test/common.py

Modified: CalendarServer/branches/users/gaya/sharedgroups/calendarserver/tools/test/test_purge.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/calendarserver/tools/test/test_purge.py	2013-02-13 23:02:11 UTC (rev 10718)
+++ CalendarServer/branches/users/gaya/sharedgroups/calendarserver/tools/test/test_purge.py	2013-02-14 01:30:18 UTC (rev 10719)
@@ -840,8 +840,8 @@
         # Share calendars each way
         home2 = (yield txn.calendarHomeWithUID(self.uid2))
         calendar2 = (yield home2.calendarWithName("calendar2"))
-        self.sharedName = (yield calendar2.shareWith(home, _BIND_MODE_WRITE))
-        self.sharedName2 = (yield calendar.shareWith(home2, _BIND_MODE_WRITE))
+        self.sharedName = (yield calendar2.shareWith(home, _BIND_MODE_WRITE)).name()
+        self.sharedName2 = (yield calendar.shareWith(home2, _BIND_MODE_WRITE)).name()
 
         (yield txn.commit())
 

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/caldav/datastore/test/common.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/caldav/datastore/test/common.py	2013-02-13 23:02:11 UTC (rev 10718)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/caldav/datastore/test/common.py	2013-02-14 01:30:18 UTC (rev 10719)
@@ -1040,7 +1040,7 @@
         """
         cal = yield self.calendarUnderTest()
         other = yield self.homeUnderTest(name=OTHER_HOME_UID)
-        newCalName = yield cal.shareWith(other, _BIND_MODE_WRITE)
+        newCalName = (yield cal.shareWith(other, _BIND_MODE_WRITE)).name()
         self.sharedName = newCalName
         yield self.commit()
         normalCal = yield self.calendarUnderTest()
@@ -1065,7 +1065,7 @@
         # yield self.commit() # txn is none? why?
         cal = yield self.calendarUnderTest()
         other = yield self.homeUnderTest(name=OTHER_HOME_UID)
-        newName = yield cal.shareWith(other, _BIND_MODE_READ)
+        newName = (yield cal.shareWith(other, _BIND_MODE_READ)).name()
         otherCal = yield other.childWithName(self.sharedName)
 
         # Name should not change just because we updated the mode.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130213/34d5b043/attachment.html>