[CalendarServer-changes] [7026] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Wed Feb 16 11:44:03 PST 2011


Revision: 7026
          http://trac.macosforge.org/projects/calendarserver/changeset/7026
Author:   cdaboo at apple.com
Date:     2011-02-16 11:44:01 -0800 (Wed, 16 Feb 2011)
Log Message:
-----------
Support a $now.D: substitution mechanism for inserting the current ISO8601 date string with D day offset from now. This
allows creation and testing of iCalendar data with current dates.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd
    CalDAVTester/trunk/src/serverinfo.py

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd	2011-02-16 19:20:31 UTC (rev 7025)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd	2011-02-16 19:44:01 UTC (rev 7026)
@@ -40,7 +40,8 @@
 			<!ELEMENT name (#PCDATA)>
 			<!ELEMENT value (#PCDATA)>
 		<!ELEMENT data (content-type, filepath)>
-			<!ATTLIST data substitutions (yes|no) "yes">
+			<!ATTLIST data substitutions (yes|no) "yes"
+			               generate      (yes|no) "no">
 			<!ELEMENT content-type (#PCDATA)>
 			<!ELEMENT filepath (#PCDATA)>
 

Modified: CalDAVTester/trunk/src/serverinfo.py
===================================================================
--- CalDAVTester/trunk/src/serverinfo.py	2011-02-16 19:20:31 UTC (rev 7025)
+++ CalDAVTester/trunk/src/serverinfo.py	2011-02-16 19:44:01 UTC (rev 7026)
@@ -18,6 +18,7 @@
 Class that encapsulates the server information for a CalDAV test run.
 """
 
+import datetime
 import src.xmlDefs
 
 class serverinfo( object ):
@@ -35,6 +36,14 @@
         self.pswd = ""
         self.subsdict = {}
         self.extrasubsdict = {}
+        
+        # Insert a bunch of date values
+        dtnow = datetime.date.today()
+        for dayoffset in xrange(-21, 21):
+            dtoffset = dtnow + datetime.timedelta(days=dayoffset)
+            key = "$now.%d:" % (dayoffset,)
+            value = "%d%02d%02d" % (dtoffset.year, dtoffset.month, dtoffset.day,)
+            self.subsdict[key] = value
 
     def subs(self, str, db=None):
         if db is None:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110216/7b4d78e1/attachment.html>


More information about the calendarserver-changes mailing list