[CalendarServer-changes] [8029] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Aug 26 13:29:38 PDT 2011
Revision: 8029
http://trac.macosforge.org/projects/calendarserver/changeset/8029
Author: cdaboo at apple.com
Date: 2011-08-26 13:29:37 -0700 (Fri, 26 Aug 2011)
Log Message:
-----------
Fixes to account for new group caching behavior and odsetup based testing.
Modified Paths:
--------------
CalDAVTester/trunk/odsetup.py
CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/server/sslserverinfo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml
Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py 2011-08-26 17:09:37 UTC (rev 8028)
+++ CalDAVTester/trunk/odsetup.py 2011-08-26 20:29:37 UTC (rev 8029)
@@ -52,6 +52,7 @@
base_dir = "../CalendarServer/"
number_of_users = 40
+number_of_groups = 10
guids = {
"testadmin" : "",
@@ -65,7 +66,7 @@
guids["resource%02d" % (i,)] = ""
guids["location%02d" % (i,)] = ""
-for i in range(1, 5):
+for i in range(1, number_of_groups + 1):
guids["group%02d" % (i,)] = ""
locations = {}
@@ -204,6 +205,10 @@
"dsAttrTypeStandard:RealName": "Room %02d",
}
+delegatedroomattrs = {
+ "dsAttrTypeStandard:RealName": "Delegated Conference Room",
+}
+
resourceattrs = {
"dsAttrTypeStandard:RealName": "Resource %02d",
}
@@ -219,8 +224,9 @@
("/Users", "user%02d", "user%02d", userattrs, None),
("/Users", "public%02d", "public%02d", publicattrs, 10),
("/Places", "location%02d", "location%02d", locationattrs, 10),
+ ("/Places", "delegatedroom", "delegatedroom", delegatedroomattrs, 1),
("/Resources", "resource%02d", "resource%02d", resourceattrs, 10),
- ("/Groups", "group%02d", "group%02d", groupattrs, 4),
+ ("/Groups", "group%02d", "group%02d", groupattrs, number_of_groups),
)
def usage():
@@ -274,11 +280,11 @@
writePlist(plist,config)
try:
- sudoerspl = readPlist('/etc/caldavd/sudoers.plist')
+ sudoerspl = readPlist(plist["SudoersFile"])
except IOError:
# create a new sudoers.plist with empty 'users' array
sudoerspl = {'users': []}
- writePlist(sudoerspl,'/etc/caldavd/sudoers.plist')
+ writePlist(sudoerspl, plist["SudoersFile"])
plist = readPlist(config)
hostname = plist["ServerHostName"]
@@ -287,7 +293,11 @@
docroot = plist["DocumentRoot"]
docroot = os.path.join(serverroot, docroot) if docroot and docroot[0] not in ('/', '.',) else docroot
+ configroot = plist["ConfigRoot"]
+ configroot = os.path.join(serverroot, configroot) if configroot and configroot[0] not in ('/', '.',) else configroot
+
sudoers = plist["SudoersFile"]
+ sudoers = os.path.join(configroot, sudoers) if sudoers and sudoers[0] not in ('/', '.',) else sudoers
port = plist["HTTPPort"]
sslport = plist["SSLPort"]
@@ -382,7 +392,6 @@
("$useradminguid:", guids["testadmin"]),
("$userapprenticeguid:", guids["apprentice"]),
("$i18nguid:", guids["i18nuser"]),
- ("$groupguid1:", guids["group01"]),
]
for i in range(1, number_of_users + 1):
@@ -393,7 +402,7 @@
subs.append(("$resourceguid%d:" % (i,), guids["resource%02d" % (i,)]))
for i in range(1, 11):
subs.append(("$locationguid%d:" % (i,), guids["location%02d" % (i,)]))
- for i in range(1, 5):
+ for i in range(1, number_of_groups + 1):
subs.append(("$groupguid%d:" % (i,), guids["group%02d" % (i,)]))
subs_str = ""
@@ -488,6 +497,9 @@
("group02", ("user06", "user07",), (),),
("group03", ("user08", "user09",), (),),
("group04", ("user10",), ("group02", "group03",),),
+ ("group05", ("user20",), ("group06",),),
+ ("group06", ("user21",), (),),
+ ("group07", ("user22", "user23", "user24",), (),),
)
for groupname, users, nestedgroups in memberships:
@@ -508,10 +520,16 @@
# Do caldav_utility setup
if path in ("/Places", "/Resources",):
if path in ("/Places",):
- cmd("%s --add-write-proxy users:user01 --set-auto-schedule=true locations:%s" % (
- utility,
- user[0],
- ))
+ if user[0] == "delegatedroom":
+ cmd("%s --add-write-proxy groups:group05 --add-read-proxy groups:group07 --set-auto-schedule=false locations:%s" % (
+ utility,
+ user[0],
+ ))
+ else:
+ cmd("%s --add-write-proxy users:user01 --set-auto-schedule=true locations:%s" % (
+ utility,
+ user[0],
+ ))
else:
cmd("%s --add-write-proxy users:user01 --add-read-proxy users:user03 --set-auto-schedule=true resources:%s" % (
utility,
Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2011-08-26 17:09:37 UTC (rev 8028)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2011-08-26 20:29:37 UTC (rev 8029)
@@ -647,8 +647,8 @@
</repeat>
- <!-- Four Group accounts -->
- <repeat count="4">
+ <!-- Ten Group accounts -->
+ <repeat count="10">
<substitution>
<key>$groupid%d:</key>
<value>group%02d</value>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2011-08-26 17:09:37 UTC (rev 8028)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2011-08-26 20:29:37 UTC (rev 8029)
@@ -646,8 +646,8 @@
</repeat>
- <!-- Four Group accounts -->
- <repeat count="4">
+ <!-- Ten Group accounts -->
+ <repeat count="10">
<substitution>
<key>$groupid%%d:</key>
<value>group%%02d</value>
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2011-08-26 17:09:37 UTC (rev 8028)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2011-08-26 20:29:37 UTC (rev 8029)
@@ -647,8 +647,8 @@
</repeat>
- <!-- Four Group accounts -->
- <repeat count="4">
+ <!-- Ten Group accounts -->
+ <repeat count="10">
<substitution>
<key>$groupid%d:</key>
<value>group%02d</value>
Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2011-08-26 17:09:37 UTC (rev 8028)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2011-08-26 20:29:37 UTC (rev 8029)
@@ -648,8 +648,8 @@
</repeat>
- <!-- Four Group accounts -->
- <repeat count="4">
+ <!-- Ten Group accounts -->
+ <repeat count="10">
<substitution>
<key>$groupid%d:</key>
<value>group%02d</value>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml 2011-08-26 17:09:37 UTC (rev 8028)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml 2011-08-26 20:29:37 UTC (rev 8029)
@@ -248,7 +248,7 @@
<description>Non-expanding group-member-set query</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$gprincipaluri4:/</ruri>
+ <ruri>$gprincipaluri4:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/expandproperty/9.xml</filepath>
@@ -261,7 +261,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$gprincipaluri4:/</value>
+ <value>$gprincipaluri4:</value>
</arg>
</verify>
<verify>
@@ -298,7 +298,7 @@
<description>Expanding group-member-set query</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$gprincipaluri4:/</ruri>
+ <ruri>$gprincipaluri4:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/expandproperty/10.xml</filepath>
@@ -311,7 +311,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$gprincipaluri4:/</value>
+ <value>$gprincipaluri4:</value>
</arg>
</verify>
<verify>
@@ -372,7 +372,7 @@
<description>Non-expanding group-membership query</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$principaluri21:/</ruri>
+ <ruri>$principaluri21:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/expandproperty/11.xml</filepath>
@@ -385,21 +385,21 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$principaluri21:/</value>
+ <value>$principaluri21:</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<arg>
<name>notcontains</name>
- <value>delegategroup</value>
+ <value>$gprincipaluri5:</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value>delegatesubgroup</value>
+ <value>$gprincipaluri6:</value>
</arg>
</verify>
</request>
@@ -411,7 +411,7 @@
<description>Expanding group-membership query</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$principaluri21:/</ruri>
+ <ruri>$principaluri21:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/expandproperty/12.xml</filepath>
@@ -424,21 +424,21 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$principaluri21:/</value>
+ <value>$principaluri21:</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value>delegategroup</value>
+ <value>$gprincipaluri5:</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value>delegatesubgroup</value>
+ <value>$gprincipaluri6:</value>
</arg>
</verify>
</request>
@@ -450,7 +450,7 @@
<description>Non-expanding group-membership query limited to proxy groups</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$principaluri21:/</ruri>
+ <ruri>$principaluri21:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/expandproperty/11.xml</filepath>
@@ -463,21 +463,21 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$principaluri21:/</value>
+ <value>$principaluri21:</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value>delegategroup</value>
+ <value>$gprincipaluri5:</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<arg>
<name>notcontains</name>
- <value>delegatesubgroup</value>
+ <value>$gprincipaluri6:</value>
</arg>
</verify>
</request>
@@ -489,7 +489,7 @@
<description>Expanding group-membership query limited to proxy groups</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$principaluri21:/</ruri>
+ <ruri>$principaluri21:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/expandproperty/12.xml</filepath>
@@ -502,21 +502,21 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$principaluri21:/</value>
+ <value>$principaluri21:</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value>delegategroup</value>
+ <value>$gprincipaluri5:</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<arg>
<name>notcontains</name>
- <value>delegatesubgroup</value>
+ <value>$gprincipaluri6:</value>
</arg>
</verify>
</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110826/6412981a/attachment-0001.html>
More information about the calendarserver-changes
mailing list