[CalendarServer-changes] [13324] CalendarServer/branches/users/sagen/newcua/twistedcaldav/test/ test_sharing.py
source_changes at macosforge.org
source_changes at macosforge.org
Fri Apr 18 11:13:02 PDT 2014
Revision: 13324
http://trac.calendarserver.org//changeset/13324
Author: sagen at apple.com
Date: 2014-04-18 11:13:02 -0700 (Fri, 18 Apr 2014)
Log Message:
-----------
Fix test_sharing
Modified Paths:
--------------
CalendarServer/branches/users/sagen/newcua/twistedcaldav/test/test_sharing.py
Modified: CalendarServer/branches/users/sagen/newcua/twistedcaldav/test/test_sharing.py
===================================================================
--- CalendarServer/branches/users/sagen/newcua/twistedcaldav/test/test_sharing.py 2014-04-18 18:05:54 UTC (rev 13323)
+++ CalendarServer/branches/users/sagen/newcua/twistedcaldav/test/test_sharing.py 2014-04-18 18:13:02 UTC (rev 13324)
@@ -80,6 +80,8 @@
def __init__(self, cuaddr, test):
if cuaddr.startswith("mailto:"):
name = cuaddr[7:].split('@')[0]
+ elif cuaddr.startswith("urn:x-uid:"):
+ name = cuaddr[10:]
elif cuaddr.startswith("urn:uuid:"):
name = cuaddr[9:]
else:
@@ -324,7 +326,7 @@
self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user02"),
+ davxml.HRef.fromString("urn:x-uid:user02"),
customxml.CommonName.fromString("User 02"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
@@ -354,7 +356,7 @@
self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user02"),
+ davxml.HRef.fromString("urn:x-uid:user02"),
customxml.CommonName.fromString("User 02"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
@@ -403,7 +405,7 @@
self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user02"),
+ davxml.HRef.fromString("urn:x-uid:user02"),
customxml.CommonName.fromString("User 02"),
customxml.InviteAccess(customxml.ReadAccess()),
customxml.InviteStatusNoResponse(),
@@ -478,21 +480,21 @@
self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user02"),
+ davxml.HRef.fromString("urn:x-uid:user02"),
customxml.CommonName.fromString("User 02"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
),
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user03"),
+ davxml.HRef.fromString("urn:x-uid:user03"),
customxml.CommonName.fromString("User 03"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
),
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user04"),
+ davxml.HRef.fromString("urn:x-uid:user04"),
customxml.CommonName.fromString("User 04"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
@@ -536,14 +538,14 @@
self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user02"),
+ davxml.HRef.fromString("urn:x-uid:user02"),
customxml.CommonName.fromString("User 02"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
),
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user04"),
+ davxml.HRef.fromString("urn:x-uid:user04"),
customxml.CommonName.fromString("User 04"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
@@ -587,14 +589,14 @@
self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user02"),
+ davxml.HRef.fromString("urn:x-uid:user02"),
customxml.CommonName.fromString("User 02"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
),
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user03"),
+ davxml.HRef.fromString("urn:x-uid:user03"),
customxml.CommonName.fromString("User 03"),
customxml.InviteAccess(customxml.ReadAccess()),
customxml.InviteStatusNoResponse(),
@@ -704,7 +706,7 @@
self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user02"),
+ davxml.HRef.fromString("urn:x-uid:user02"),
customxml.CommonName.fromString("User 02"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
@@ -719,7 +721,7 @@
self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user02"),
+ davxml.HRef.fromString("urn:x-uid:user02"),
customxml.CommonName.fromString("user02"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
@@ -848,7 +850,7 @@
self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user02"),
+ davxml.HRef.fromString("urn:x-uid:user02"),
customxml.CommonName.fromString("User 02"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
@@ -878,7 +880,7 @@
self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user02"),
+ davxml.HRef.fromString("urn:x-uid:user02"),
customxml.CommonName.fromString("User 02"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
@@ -922,7 +924,7 @@
self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
customxml.InviteUser(
customxml.UID.fromString(""),
- davxml.HRef.fromString("urn:uuid:user02"),
+ davxml.HRef.fromString("urn:x-uid:user02"),
customxml.CommonName.fromString("User 02"),
customxml.InviteAccess(customxml.ReadWriteAccess()),
customxml.InviteStatusNoResponse(),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140418/0a2ef5a2/attachment.html>
More information about the calendarserver-changes
mailing list