[CalendarServer-changes] [11564] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Jul 29 17:15:55 PDT 2013


Revision: 11564
          http://trac.calendarserver.org//changeset/11564
Author:   cdaboo at apple.com
Date:     2013-07-29 17:15:55 -0700 (Mon, 29 Jul 2013)
Log Message:
-----------
Make sure we use substitution variables for user data. Also need some extra resources provisioned in OD.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/put/12.ics
    CalDAVTester/trunk/odsetup.py

Modified: CalDAVTester/trunk/Resource/CalDAV/put/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/put/12.ics	2013-07-29 21:45:02 UTC (rev 11563)
+++ CalDAVTester/trunk/Resource/CalDAV/put/12.ics	2013-07-30 00:15:55 UTC (rev 11564)
@@ -7,6 +7,6 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-X-CALENDARSERVER-MODIFIED-BY;CN=User 01;EMAIL="user01 at example.com":urn:uuid:user01
+X-CALENDARSERVER-MODIFIED-BY;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py	2013-07-29 21:45:02 UTC (rev 11563)
+++ CalDAVTester/trunk/odsetup.py	2013-07-30 00:15:55 UTC (rev 11564)
@@ -229,12 +229,12 @@
     ("/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),
+    ("/Resources", "resource%02d", "resource%02d", resourceattrs, 20),
     ("/Groups", "group%02d", "group%02d", groupattrs, number_of_groups),
 )
 
 def usage():
-    print """Usage: odsteup [options] create|create-users|remove
+    print """Usage: odsetup [options] create|create-users|remove
 Options:
     -h        Print this help and exit
     -n node   OpenDirectory node to target
@@ -253,6 +253,9 @@
         print "-----"
     if verbose:
         print args.replace(diradmin_pswd, "xxxx")
+    if veryverbose and input:
+        print input
+        print "*****"
     if input:
         p = Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE, shell=True)
         result = p.communicate(input)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130729/2439a88f/attachment-0001.html>


More information about the calendarserver-changes mailing list