[CalendarServer-changes] [7187] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Sat Mar 12 20:31:14 PST 2011
Revision: 7187
http://trac.macosforge.org/projects/calendarserver/changeset/7187
Author: cdaboo at apple.com
Date: 2011-03-12 20:31:12 -0800 (Sat, 12 Mar 2011)
Log Message:
-----------
Fix tests now that error-description is included in all error elements.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml
CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml
CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml
CalDAVTester/trunk/verifiers/prepostcondition.py
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml 2011-03-13 04:17:55 UTC (rev 7186)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml 2011-03-13 04:31:12 UTC (rev 7187)
@@ -195,7 +195,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -358,7 +357,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -395,7 +393,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -414,7 +411,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-object-resource</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -433,7 +429,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-object-resource</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -470,7 +465,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -558,7 +552,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -823,7 +816,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -1373,7 +1365,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml 2011-03-13 04:17:55 UTC (rev 7186)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml 2011-03-13 04:31:12 UTC (rev 7187)
@@ -479,7 +479,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}attendee-allowed</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml 2011-03-13 04:17:55 UTC (rev 7186)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml 2011-03-13 04:31:12 UTC (rev 7187)
@@ -404,7 +404,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -423,7 +422,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -442,7 +440,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -481,7 +478,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -500,7 +496,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -544,7 +539,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2011-03-13 04:17:55 UTC (rev 7186)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2011-03-13 04:31:12 UTC (rev 7187)
@@ -1213,7 +1213,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml 2011-03-13 04:17:55 UTC (rev 7186)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml 2011-03-13 04:31:12 UTC (rev 7187)
@@ -167,8 +167,7 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
- </arg>
+s </arg>
</verify>
</request>
</test>
@@ -186,7 +185,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -205,7 +203,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml 2011-03-13 04:17:55 UTC (rev 7186)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml 2011-03-13 04:31:12 UTC (rev 7187)
@@ -654,7 +654,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
@@ -687,7 +686,6 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
- <value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/verifiers/prepostcondition.py
===================================================================
--- CalDAVTester/trunk/verifiers/prepostcondition.py 2011-03-13 04:17:55 UTC (rev 7186)
+++ CalDAVTester/trunk/verifiers/prepostcondition.py 2011-03-13 04:31:12 UTC (rev 7187)
@@ -48,7 +48,8 @@
expected = set(teststatus)
got = set()
for child in tree.getroot().getchildren():
- got.add(child.tag)
+ if child.tag != "{http://twistedmatrix.com/xml_namespace/dav/}error-description":
+ got.add(child.tag)
missing = expected.difference(got)
extras = got.difference(expected)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110312/d60f2f73/attachment-0001.html>
More information about the calendarserver-changes
mailing list