[CalendarServer-changes] [11573] CalDAVTester/trunk/odsetup.py

[source_changes at macosforge.org]

Revision: 11573
          http://trac.calendarserver.org//changeset/11573
Author:   cdaboo at apple.com
Date:     2013-07-31 17:05:09 -0700 (Wed, 31 Jul 2013)
Log Message:
-----------
Make sure the right numbers of record types are always created and added to serverinfo.xml.

Modified Paths:
--------------
    CalDAVTester/trunk/odsetup.py

Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py	2013-07-31 23:56:09 UTC (rev 11572)
+++ CalDAVTester/trunk/odsetup.py	2013-08-01 00:05:09 UTC (rev 11573)
@@ -57,6 +57,9 @@
 
 number_of_users = 40
 number_of_groups = 10
+number_of_publics = 10
+number_of_resources = 20
+number_of_locations = 10
 
 guids = {
     "testadmin"  : "",
@@ -66,13 +69,19 @@
 
 for i in range(1, number_of_users + 1):
     guids["user%02d" % (i,)] = ""
+
+for i in range(1, number_of_publics + 1):
     guids["public%02d" % (i,)] = ""
-    guids["resource%02d" % (i,)] = ""
-    guids["location%02d" % (i,)] = ""
 
 for i in range(1, number_of_groups + 1):
     guids["group%02d" % (i,)] = ""
 
+for i in range(1, number_of_resources + 1):
+    guids["resource%02d" % (i,)] = ""
+
+for i in range(1, number_of_locations + 1):
+    guids["location%02d" % (i,)] = ""
+
 locations = {}
 resources = {}
 
@@ -226,10 +235,10 @@
     ("/Users", "apprentice", "apprentice", apprenticeattrs, 1),
     ("/Users", "i18nuser", "i18nuser", i18nattrs, 1),
     ("/Users", "user%02d", "user%02d", userattrs, None),
-    ("/Users", "public%02d", "public%02d", publicattrs, 10),
-    ("/Places", "location%02d", "location%02d", locationattrs, 10),
+    ("/Users", "public%02d", "public%02d", publicattrs, number_of_publics),
+    ("/Places", "location%02d", "location%02d", locationattrs, number_of_locations),
     ("/Places", "delegatedroom", "delegatedroom", delegatedroomattrs, 1),
-    ("/Resources", "resource%02d", "resource%02d", resourceattrs, 20),
+    ("/Resources", "resource%02d", "resource%02d", resourceattrs, number_of_resources),
     ("/Groups", "group%02d", "group%02d", groupattrs, number_of_groups),
 )
 
@@ -373,11 +382,11 @@
 
     for i in range(1, number_of_users + 1):
         subs.append(("$userguid%d:" % (i,), guids["user%02d" % (i,)]))
-    for i in range(1, 11):
+    for i in range(1, number_of_publics + 1):
         subs.append(("$publicuserguid%d:" % (i,), guids["public%02d" % (i,)]))
-    for i in range(1, 11):
+    for i in range(1, number_of_resources + 1):
         subs.append(("$resourceguid%d:" % (i,), guids["resource%02d" % (i,)]))
-    for i in range(1, 11):
+    for i in range(1, number_of_locations + 1):
         subs.append(("$locationguid%d:" % (i,), guids["location%02d" % (i,)]))
     for i in range(1, number_of_groups + 1):
         subs.append(("$groupguid%d:" % (i,), guids["group%02d" % (i,)]))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130731/c37df176/attachment.html>