[CalendarServer-changes] [7963] CalendarServer/branches/users/glyph/imip-and-admin-html/ calendarserver/webadmin/test/test_resource.py

[source_changes at macosforge.org]

Revision: 7963
          http://trac.macosforge.org/projects/calendarserver/changeset/7963
Author:   glyph at apple.com
Date:     2011-08-11 21:51:57 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
optionally turn off proxies

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py	2011-08-12 04:51:46 UTC (rev 7962)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py	2011-08-12 04:51:57 UTC (rev 7963)
@@ -319,12 +319,13 @@
 
 class FakePrincipalResource(object):
     def __init__(self, test, req=None, resid='no-id-given', autosched=True,
-                 recordType="users", extraProperties=()):
+                 recordType="users", extraProperties=(), hasProxies=True):
         self.test = test
         self.resid = resid
         self.autosched = autosched
         self.recordType = recordType
         self.extraProperties = extraProperties
+        self.hasProxies = hasProxies
 
 
     @property
@@ -346,19 +347,26 @@
 
     def getChild(self, name):
         if name == 'calendar-proxy-read':
+            if self.hasProxies:
+                proxyProps = [GroupMemberSet(HRef("read-1"),
+                                             HRef("read-2"),
+                                             HRef("read-3"))]
+            else:
+                proxyProps = []
             return FakePrincipalResource(
                 self.test,
-                extraProperties=[GroupMemberSet(HRef("read-1"),
-                                                HRef("read-2"),
-                                                HRef("read-3"))]
+                extraProperties=proxyProps
             )
         elif name == 'calendar-proxy-write':
+            if self.hasProxies:
+                proxyProps = [GroupMemberSet(HRef("write-1"),
+                                             HRef("write-2"))]
+            else:
+                proxyProps = []
             return FakePrincipalResource(
                 self.test,
-                extraProperties=[GroupMemberSet(HRef("write-1"),
-                                                HRef("write-2"))]
+                extraProperties=proxyProps
             )
-        return self
 
 
     @inlineCallbacks
@@ -371,8 +379,6 @@
                 returnValue(prop)
         if name == DisplayName.qname():
             returnValue(DisplayName("The Name To Display"))
-        elif name == GroupMemberSet.qname():
-            returnValue(GroupMemberSet())
         else:
             raise HTTPError(CONFLICT)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/11a5a947/attachment.html>