[CalendarServer-changes] [6241] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 6241
          http://trac.macosforge.org/projects/calendarserver/changeset/6241
Author:   cdaboo at apple.com
Date:     2010-09-03 12:26:13 -0700 (Fri, 03 Sep 2010)
Log Message:
-----------
Test for proper mkcol-response element in the response.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CardDAV/mkcol.xml
    CalDAVTester/trunk/verifiers/propfindItems.py

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/mkcol.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/mkcol.xml	2010-09-03 19:25:05 UTC (rev 6240)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/mkcol.xml	2010-09-03 19:26:13 UTC (rev 6241)
@@ -74,6 +74,14 @@
 				<verify>
 					<callback>propfindItems</callback>
 					<arg>
+						<name>status</name>
+						<value>400</value>
+					</arg>
+					<arg>
+						<name>root-element</name>
+						<value>{DAV:}mkcol-response</value>
+					</arg>
+					<arg>
 						<name>badprops</name>
 						<value>{DAV:}resourcetype</value>
 						<value>{DAV:}getetag</value>

Modified: CalDAVTester/trunk/verifiers/propfindItems.py
===================================================================
--- CalDAVTester/trunk/verifiers/propfindItems.py	2010-09-03 19:25:05 UTC (rev 6240)
+++ CalDAVTester/trunk/verifiers/propfindItems.py	2010-09-03 19:26:13 UTC (rev 6241)
@@ -43,6 +43,13 @@
         else:
             root = "{DAV:}multistatus"
 
+        # Check how many responses are returned
+        status = args.get("status", [])
+        if len(status) == 1:
+            status = int(status[0])
+        else:
+            status = 207
+
         def normalizeXML(value):
             
             if value[0] == '<':
@@ -89,7 +96,7 @@
         # mismatches.
         
         # Must have MULTISTATUS response code
-        if response.status != 207:
+        if response.status != status:
             return False, "           HTTP Status for Request: %d\n" % (response.status,)
 
         # Read in XML
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100903/aa819965/attachment-0001.html>