[CalendarServer-changes] [11612] CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav

[source_changes at macosforge.org]

Revision: 11612
          http://trac.calendarserver.org//changeset/11612
Author:   cdaboo at apple.com
Date:     2013-08-16 10:09:40 -0700 (Fri, 16 Aug 2013)
Log Message:
-----------
Handle potential flaky directory.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/sharing.py
    CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/test/test_sharing.py

Modified: CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/sharing.py	2013-08-16 16:11:08 UTC (rev 11611)
+++ CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/sharing.py	2013-08-16 17:09:40 UTC (rev 11612)
@@ -485,7 +485,9 @@
         for invitation in invitations:
             if invitation.status() != _BIND_STATUS_INVALID:
                 if not (yield self.validUserIDForShare("urn:uuid:" + invitation.shareeUID(), request)):
-                    yield self._updateInvitation(invitation, status=_BIND_STATUS_INVALID)
+                    # FIXME: temporarily disable this to deal with flaky directory
+                    #yield self._updateInvitation(invitation, status=_BIND_STATUS_INVALID)
+                    self.log.error("Invalid sharee detected: {uid}", uid=invitation.shareeUID())
 
         returnValue(invitations)
 

Modified: CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/test/test_sharing.py
===================================================================
--- CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/test/test_sharing.py	2013-08-16 16:11:08 UTC (rev 11611)
+++ CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/test/test_sharing.py	2013-08-16 17:09:40 UTC (rev 11612)
@@ -728,7 +728,7 @@
                 davxml.HRef.fromString("urn:uuid:user02"),
                 customxml.CommonName.fromString("user02"),
                 customxml.InviteAccess(customxml.ReadWriteAccess()),
-                customxml.InviteStatusInvalid(),
+                customxml.InviteStatusNoResponse(),
             )
         ))
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130816/dec82c50/attachment-0001.html>