[CalendarServer-changes] [2218] CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/ directory/test/test_guidchange.py
source_changes at macosforge.org
source_changes at macosforge.org
Mon Mar 10 13:49:11 PDT 2008
Revision: 2218
http://trac.macosforge.org/projects/calendarserver/changeset/2218
Author: wsanchez at apple.com
Date: 2008-03-10 13:49:10 -0700 (Mon, 10 Mar 2008)
Log Message:
-----------
Cosmetic.
Modified Paths:
--------------
CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/directory/test/test_guidchange.py
Modified: CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/directory/test/test_guidchange.py
===================================================================
--- CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/directory/test/test_guidchange.py 2008-03-07 22:37:56 UTC (rev 2217)
+++ CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/directory/test/test_guidchange.py 2008-03-10 20:49:10 UTC (rev 2218)
@@ -45,7 +45,7 @@
self.directoryService = XMLDirectoryService(self.xmlfile)
# Set up a principals hierarchy for each service we're testing with
- name = 'principals'
+ name = "principals"
url = "/" + name + "/"
path = os.path.join(self.docroot, url[1:])
@@ -55,7 +55,7 @@
provisioningResource = DirectoryPrincipalProvisioningResource(path, url, self.directoryService)
- self.site.resource.putChild('principals', provisioningResource)
+ self.site.resource.putChild("principals", provisioningResource)
self.setupCalendars()
@@ -63,25 +63,29 @@
def setupCalendars(self):
calendarCollection = CalendarHomeProvisioningFile(
- os.path.join(self.docroot, 'calendars'),
+ os.path.join(self.docroot, "calendars"),
self.directoryService,
- '/calendars/'
+ "/calendars/"
)
- self.site.resource.putChild('calendars', calendarCollection)
+ self.site.resource.putChild("calendars", calendarCollection)
def resetCalendars(self):
- del self.site.resource.putChildren['calendars']
+ del self.site.resource.putChildren["calendars"]
self.setupCalendars()
def test_guidchange(self):
"""
DirectoryPrincipalResource.proxies()
"""
+ oldUID = "5A985493-EE2C-4665-94CF-4DFEA3A89500"
+ newUID = "38D8AC00-5490-4425-BE3A-05FFB9862444"
+
+ homeResource = "/calendars/users/cdaboo/"
def privs1(result):
# Change GUID in record
fd = open(self.xmlfile, "w")
- fd.write(open(xmlFile.path, "r").read().replace("5A985493-EE2C-4665-94CF-4DFEA3A89500", "38D8AC00-5490-4425-BE3A-05FFB9862444"))
+ fd.write(open(xmlFile.path, "r").read().replace(oldUID, newUID))
fd.close()
fd = None
@@ -93,31 +97,31 @@
self.resetCalendars()
# Make sure new user cannot access old user's calendar home
- return self._checkPrivileges(None, "/calendars/users/cdaboo/", davxml.HRef("/principals/__uids__/38D8AC00-5490-4425-BE3A-05FFB9862444/"), davxml.Write, False)
+ return self._checkPrivileges(None, homeResource, davxml.HRef("/principals/__uids__/" + newUID + "/"), davxml.Write, False)
# Make sure current user has access to their calendar home
- d = self._checkPrivileges(None, "/calendars/users/cdaboo/", davxml.HRef("/principals/__uids__/5A985493-EE2C-4665-94CF-4DFEA3A89500/"), davxml.Write, True)
+ d = self._checkPrivileges(None, homeResource, davxml.HRef("/principals/__uids__/" + oldUID + "/"), davxml.Write, True)
d.addCallback(privs1)
return d
def _checkPrivileges(self, resource, url, principal, privilege, allowed):
- request = SimpleRequest(self.site, "GET", "/calendars/users/cdaboo/")
+ request = SimpleRequest(self.site, "GET", "/")
def gotResource(resource):
d = resource.checkPrivileges(request, (privilege,), principal=davxml.Principal(principal))
if allowed:
def onError(f):
f.trap(AccessDeniedError)
- #print resource.readDeadProperty(davxml.ACL)
- self.fail("%s should have %s privilege on %r" % (principal.sname(), privilege.sname(), resource))
+ #print resource.readDeadProperty(davxml.ACL).toxml()
+ self.fail("%s should have %s privilege on %r" % (principal, privilege.sname(), resource))
d.addErrback(onError)
else:
def onError(f):
f.trap(AccessDeniedError)
def onSuccess(_):
- #print resource.readDeadProperty(davxml.ACL)
- self.fail("%s should not have %s privilege on %r" % (principal.sname(), privilege.sname(), resource))
+ #print resource.readDeadProperty(davxml.ACL).toxml()
+ self.fail("%s should not have %s privilege on %r" % (principal, privilege.sname(), resource))
d.addCallback(onSuccess)
d.addErrback(onError)
return d
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080310/1690ede6/attachment.html
More information about the calendarserver-changes
mailing list