[CalendarServer-changes] [928]
CalendarServer/branches/users/dreid/principalsOnDemand-114-2/
twistedcaldav
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jan 4 20:08:16 PST 2007
Revision: 928
http://trac.macosforge.org/projects/calendarserver/changeset/928
Author: dreid at apple.com
Date: 2007-01-04 20:08:16 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
merge forward to pick up fixed DirectoryService tests.
Modified Paths:
--------------
CalendarServer/branches/users/dreid/principalsOnDemand-114-2/twistedcaldav/directory/principal.py
CalendarServer/branches/users/dreid/principalsOnDemand-114-2/twistedcaldav/test/test_root.py
Modified: CalendarServer/branches/users/dreid/principalsOnDemand-114-2/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/dreid/principalsOnDemand-114-2/twistedcaldav/directory/principal.py 2007-01-05 04:07:27 UTC (rev 927)
+++ CalendarServer/branches/users/dreid/principalsOnDemand-114-2/twistedcaldav/directory/principal.py 2007-01-05 04:08:16 UTC (rev 928)
@@ -81,7 +81,7 @@
# Provision in __init__() because principals are used prior to request
# lookups.
- self.provision()
+# self.provision() #
# Create children
for recordType in self.directory.recordTypes():
@@ -140,6 +140,7 @@
raise HTTPError(responsecode.NOT_FOUND)
def getChild(self, name):
+ self.provision()
return self.putChildren.get(name, None)
def listChildren(self):
@@ -176,7 +177,7 @@
# Provision in __init__() because principals are used prior to request
# lookups.
- self.provision()
+# self.provision()
def principalForUser(self, user):
return self.parent.principalForUser(user)
@@ -196,6 +197,7 @@
raise HTTPError(responsecode.NOT_FOUND)
def getChild(self, name, record=None):
+ self.provision()
if name == "":
return self
Modified: CalendarServer/branches/users/dreid/principalsOnDemand-114-2/twistedcaldav/test/test_root.py
===================================================================
--- CalendarServer/branches/users/dreid/principalsOnDemand-114-2/twistedcaldav/test/test_root.py 2007-01-05 04:07:27 UTC (rev 927)
+++ CalendarServer/branches/users/dreid/principalsOnDemand-114-2/twistedcaldav/test/test_root.py 2007-01-05 04:08:16 UTC (rev 928)
@@ -67,6 +67,10 @@
'/principals/',
directory)
+ # Otherwise the tests that never touch the root resource will
+ # fail on teardown.
+ principals.provision()
+
root = RootResource(self.docroot,
principalCollections=[principals])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070104/3fb869aa/attachment.html
More information about the calendarserver-changes
mailing list