[CalendarServer-changes] [1751] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Aug 2 09:37:05 PDT 2007
Revision: 1751
http://trac.macosforge.org/projects/calendarserver/changeset/1751
Author: cdaboo at apple.com
Date: 2007-08-02 09:37:05 -0700 (Thu, 02 Aug 2007)
Log Message:
-----------
Add an "unwrap" option to thw dataString test so we can ignore any iCalendar line wrapping that we
have not control over.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/schedulepost.xml
CalDAVTester/trunk/verifiers/dataString.py
Modified: CalDAVTester/trunk/scripts/tests/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepost.xml 2007-08-01 21:16:51 UTC (rev 1750)
+++ CalDAVTester/trunk/scripts/tests/schedulepost.xml 2007-08-02 16:37:05 UTC (rev 1751)
@@ -660,10 +660,13 @@
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value>FREEBUSY;FBTYPE=BUSY:20060101T170000Z/PT1H,20060101T190000Z/PT1H,20060101T
- 220000Z/PT1H</value>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T170000Z/PT1H,20060101T190000Z/PT1H,20060101T220000Z/PT1H</value>
<value>FREEBUSY;FBTYPE=BUSY:20060101T190000Z/PT2H,20060101T220000Z/PT1H</value>
</arg>
+ <arg>
+ <name>unwrap</name>
+ <value/>
+ </arg>
</verify>
</request>
</test>
@@ -694,6 +697,10 @@
<value><![CDATA[<recipient-exists xmlns='urn:ietf:params:xml:ns:caldav'/>]]></value>
<value>FREEBUSY;FBTYPE=BUSY:20060101T190000Z/PT2H,20060101T220000Z/PT1H</value>
</arg>
+ <arg>
+ <name>unwrap</name>
+ <value/>
+ </arg>
</verify>
</request>
</test>
@@ -723,6 +730,10 @@
<name>contains</name>
<value>ATTENDEE;CN=User 02:$cuaddraltnoslash2:</value>
</arg>
+ <arg>
+ <name>unwrap</name>
+ <value/>
+ </arg>
</verify>
</request>
</test>
Modified: CalDAVTester/trunk/verifiers/dataString.py
===================================================================
--- CalDAVTester/trunk/verifiers/dataString.py 2007-08-01 21:16:51 UTC (rev 1750)
+++ CalDAVTester/trunk/verifiers/dataString.py 2007-08-02 16:37:05 UTC (rev 1751)
@@ -26,6 +26,7 @@
# Get arguments
contains = args.get("contains", [])
notcontains = args.get("notcontains", [])
+ unwrap = args.get("unwrap")
# status code must be 200, 207
if response.status not in (200,207):
@@ -35,12 +36,17 @@
if not respdata:
return False, " No response body"
+ # Un wrap if required
+ if unwrap is not None:
+ newrespdata = respdata.replace("\r\n ", "")
+ else:
+ newrespdata = respdata
# Check each contains and not-contains (AND operation)
for item in contains:
- if respdata.find(item.replace("\n", "\r\n")) == -1:
+ if newrespdata.find(item.replace("\n", "\r\n")) == -1:
return False, " Response data does not contain \"%s\"" % (item,)
for item in notcontains:
- if respdata.find(item.replace("\n", "\r\n")) != -1:
+ if newrespdata.find(item.replace("\n", "\r\n")) != -1:
return False, " Response data incorrectly contains \"%s\"" % (item,)
return True, ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070802/5997cac0/attachment.html
More information about the calendarserver-changes
mailing list