[CalendarServer-changes] [11331] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 11331
          http://trac.calendarserver.org//changeset/11331
Author:   cdaboo at apple.com
Date:     2013-06-12 08:30:46 -0700 (Wed, 12 Jun 2013)
Log Message:
-----------
Fix for handling arbitrary elements inside DAV:error.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
    CalDAVTester/trunk/verifiers/prepostcondition.py

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml	2013-06-12 15:29:33 UTC (rev 11330)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml	2013-06-12 15:30:46 UTC (rev 11331)
@@ -217,6 +217,10 @@
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-object-resource</value>
 					</arg>
+					<arg>
+						<name>ignoreextras</name>
+						<value>true</value>
+					</arg>
 				</verify>
 			</request>
 		</test>

Modified: CalDAVTester/trunk/verifiers/prepostcondition.py
===================================================================
--- CalDAVTester/trunk/verifiers/prepostcondition.py	2013-06-12 15:29:33 UTC (rev 11330)
+++ CalDAVTester/trunk/verifiers/prepostcondition.py	2013-06-12 15:30:46 UTC (rev 11331)
@@ -27,6 +27,7 @@
         # If no status verification requested, then assume all 2xx codes are OK
         teststatus = args.get("error", [])
         statusCode = args.get("status", ["403", "409", "507"])
+        ignoreextras = args.get("ignoreextras", None)
 
         # status code could be anything, but typically 403, 409 or 507
         if str(response.status) not in statusCode:
@@ -57,11 +58,11 @@
         err_txt = ""
         if len(missing):
             err_txt += "        Items not returned in error: element %s" % str(missing)
-        if len(extras):
+        if len(extras) and not ignoreextras:
             if len(err_txt):
                 err_txt += "\n"
             err_txt += "        Unexpected items returned in error element: %s" % str(extras)
-        if len(missing) or len(extras):
+        if len(missing) or len(extras) and not ignoreextras:
             return False, err_txt
 
         return True, ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130612/69c44e0f/attachment.html>