[CalendarServer-changes] [11556]

[source_changes at macosforge.org]

Revision: 11556
          http://trac.calendarserver.org//changeset/11556
Author:   gaya at apple.com
Date:     2013-07-24 14:06:22 -0700 (Wed, 24 Jul 2013)
Log Message:
-----------
Change bind row status to _BIND_STATUS_INVITED when during reinvite; fix CalDAV tests for this case.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/13.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
    CalendarServer/trunk/twistedcaldav/sharing.py

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/13.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/13.xml	2013-07-24 17:40:08 UTC (rev 11555)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/13.xml	2013-07-24 21:06:22 UTC (rev 11556)
@@ -3,7 +3,7 @@
   <invite-notification shared-type='calendar'>
     <uid></uid>
     <href xmlns='DAV:'>$cuaddrurn2:</href>
-    <invite-declined/>
+    <invite-noresponse/>
     <access>
       <read-write/>
     </access>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml	2013-07-24 17:40:08 UTC (rev 11555)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml	2013-07-24 21:06:22 UTC (rev 11556)
@@ -560,7 +560,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Reshare after sharee DELETE shared calendar' ignore='yes'>
+	<test-suite name='Reshare after sharee DELETE shared calendar' ignore='no'>
 		<test name='0' ignore='no'>
 			<description>Sharee deletes calendar</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml	2013-07-24 17:40:08 UTC (rev 11555)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml	2013-07-24 21:06:22 UTC (rev 11556)
@@ -526,7 +526,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Reshare after sharee DELETE shared addressbook' ignore='yes'>
+	<test-suite name='Reshare after sharee DELETE shared addressbook' ignore='no'>
 		<test name='0' ignore='no'>
 			<description>Delete address book group</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>

Modified: CalendarServer/trunk/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/sharing.py	2013-07-24 17:40:08 UTC (rev 11555)
+++ CalendarServer/trunk/twistedcaldav/sharing.py	2013-07-24 21:06:22 UTC (rev 11556)
@@ -624,7 +624,8 @@
         # Look for existing invite and update its fields or create new one
         invitation = yield self._invitationForShareeUID(shareeUID)
         if invitation:
-            yield self._updateInvitation(invitation, mode=invitationBindModeFromXMLMap[type(ace)], summary=summary)
+            status = _BIND_STATUS_INVITED if invitation.status() in (_BIND_STATUS_DECLINED, _BIND_STATUS_INVALID) else None
+            yield self._updateInvitation(invitation, mode=invitationBindModeFromXMLMap[type(ace)], status=status, summary=summary)
         else:
             invitation = yield self._createInvitation(
                                 shareeUID=shareeUID,
@@ -719,6 +720,8 @@
         state = notificationState if notificationState else invitation.status()
         summary = invitation.summary() if displayName is None else displayName
 
+        print("sendInviteNotification:%s userid=%s, state=%s, summary=%s" % (self, userid, state, summary,))
+
         typeAttr = {'shared-type': self.sharedResourceType()}
         xmltype = customxml.InviteNotification(**typeAttr)
         xmldata = customxml.Notification(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130724/2255a157/attachment.html>