[CalendarServer-changes] [6636] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Nov 15 12:33:48 PST 2010


Revision: 6636
          http://trac.macosforge.org/projects/calendarserver/changeset/6636
Author:   cdaboo at apple.com
Date:     2010-11-15 12:33:45 -0800 (Mon, 15 Nov 2010)
Log Message:
-----------
Use canonical calendar data matching for all .ics matches. Have regular data match display a diff on error.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/get.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostauto.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurcancel.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurrequest.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurspecial.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/servertoserverincoming.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/timezoneservice.xml
    CalDAVTester/trunk/verifiers/dataMatch.py
    CalDAVTester/trunk/verifiers/xmlDataMatch.py

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml	2010-11-15 20:00:58 UTC (rev 6635)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml	2010-11-15 20:33:45 UTC (rev 6636)
@@ -118,7 +118,7 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/availability/1.ics</value>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/get.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/get.xml	2010-11-15 20:00:58 UTC (rev 6635)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/get.xml	2010-11-15 20:33:45 UTC (rev 6636)
@@ -77,7 +77,7 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/todo/1.txt</value>
@@ -151,7 +151,7 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/get/1.ics</value>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostauto.xml	2010-11-15 20:00:58 UTC (rev 6635)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostauto.xml	2010-11-15 20:33:45 UTC (rev 6636)
@@ -99,7 +99,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/1.ics</value>
@@ -131,7 +131,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/2.ics</value>
@@ -163,7 +163,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/3.ics</value>
@@ -216,7 +216,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/19.ics</value>
@@ -248,7 +248,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/20.ics</value>
@@ -337,7 +337,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/21.ics</value>
@@ -369,7 +369,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/5.ics</value>
@@ -466,7 +466,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/21.ics</value>
@@ -498,7 +498,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/5.ics</value>
@@ -587,7 +587,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/7.ics</value>
@@ -655,7 +655,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/8.ics</value>
@@ -708,7 +708,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/9.ics</value>
@@ -776,7 +776,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/10.ics</value>
@@ -829,7 +829,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/11.ics</value>
@@ -861,7 +861,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/12.ics</value>
@@ -893,7 +893,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/13.ics</value>
@@ -946,7 +946,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/14.ics</value>
@@ -1014,7 +1014,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/15.ics</value>
@@ -1067,7 +1067,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/16.ics</value>
@@ -1135,7 +1135,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/17.ics</value>
@@ -1226,7 +1226,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleauto/18.ics</value>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurcancel.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurcancel.xml	2010-11-15 20:00:58 UTC (rev 6635)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurcancel.xml	2010-11-15 20:33:45 UTC (rev 6636)
@@ -87,7 +87,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurcancel/2.ics</value>
@@ -150,7 +150,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurcancel/4.ics</value>
@@ -213,7 +213,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurcancel/6.ics</value>
@@ -276,7 +276,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurcancel/6.ics</value>
@@ -402,7 +402,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurcancel/10.ics</value>
@@ -465,7 +465,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurcancel/12.ics</value>
@@ -528,7 +528,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurcancel/14.ics</value>
@@ -591,7 +591,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurcancel/16.ics</value>
@@ -654,7 +654,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurcancel/18.ics</value>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurrequest.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurrequest.xml	2010-11-15 20:00:58 UTC (rev 6635)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurrequest.xml	2010-11-15 20:33:45 UTC (rev 6636)
@@ -87,7 +87,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/2.ics</value>
@@ -101,7 +101,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/3.ics</value>
@@ -150,7 +150,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/5.ics</value>
@@ -164,7 +164,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/6.ics</value>
@@ -213,7 +213,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/8.ics</value>
@@ -227,7 +227,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/9.ics</value>
@@ -276,7 +276,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/11.ics</value>
@@ -290,7 +290,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/12.ics</value>
@@ -339,7 +339,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/14.ics</value>
@@ -353,7 +353,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/15.ics</value>
@@ -402,7 +402,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/17.ics</value>
@@ -416,7 +416,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/18.ics</value>
@@ -465,7 +465,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/20.ics</value>
@@ -479,7 +479,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/21.ics</value>
@@ -528,7 +528,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurrequest/23.ics</value>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurspecial.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurspecial.xml	2010-11-15 20:00:58 UTC (rev 6635)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurspecial.xml	2010-11-15 20:33:45 UTC (rev 6636)
@@ -87,7 +87,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurspecial/2.ics</value>
@@ -147,7 +147,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurspecial/4.ics</value>
@@ -207,7 +207,7 @@
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/scheduleautorecurspecial/6.ics</value>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/servertoserverincoming.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/servertoserverincoming.xml	2010-11-15 20:00:58 UTC (rev 6635)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/servertoserverincoming.xml	2010-11-15 20:33:45 UTC (rev 6636)
@@ -138,7 +138,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/servertoserver/6.ics</value>
@@ -180,7 +180,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/servertoserver/7.ics</value>
@@ -194,7 +194,7 @@
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/servertoserver/7.ics</value>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/timezoneservice.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/timezoneservice.xml	2010-11-15 20:00:58 UTC (rev 6635)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/timezoneservice.xml	2010-11-15 20:33:45 UTC (rev 6636)
@@ -370,7 +370,7 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/timezoneservice/New_York.ics</value>
@@ -387,7 +387,7 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/timezoneservice/New_York.ics</value>
@@ -404,7 +404,7 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/timezoneservice/London.ics</value>
@@ -421,7 +421,7 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/timezoneservice/London.ics</value>
@@ -438,7 +438,7 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/timezoneservice/GB.ics</value>
@@ -455,7 +455,7 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/timezoneservice/GB.ics</value>

Modified: CalDAVTester/trunk/verifiers/dataMatch.py
===================================================================
--- CalDAVTester/trunk/verifiers/dataMatch.py	2010-11-15 20:00:58 UTC (rev 6635)
+++ CalDAVTester/trunk/verifiers/dataMatch.py	2010-11-15 20:33:45 UTC (rev 6636)
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ##
+from difflib import unified_diff
 
 """
 Verifier that checks the response body for an exact match to data in a file.
@@ -81,4 +82,5 @@
         if result:
             return True, ""
         else:
-            return False, "        Response data does not exactly match file data"
+            error_diff = "\n".join([line for line in unified_diff(data.split("\n"), respdata.split("\n"))])
+            return False, "        Response data does not exactly match file data %s" % (error_diff,)

Modified: CalDAVTester/trunk/verifiers/xmlDataMatch.py
===================================================================
--- CalDAVTester/trunk/verifiers/xmlDataMatch.py	2010-11-15 20:00:58 UTC (rev 6635)
+++ CalDAVTester/trunk/verifiers/xmlDataMatch.py	2010-11-15 20:33:45 UTC (rev 6636)
@@ -80,6 +80,6 @@
                 return True, ""
             else:
                 error_diff = "\n".join([line for line in unified_diff(data.split("\n"), respdata.split("\n"))])
-                return False, "        Response data does not exactly match file data%s" % (error_diff,)
+                return False, "        Response data does not exactly match file data %s" % (error_diff,)
         except Exception, e:
             return False, "        Response data is not xml data: %s" % (e,)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101115/84c79e33/attachment-0001.html>


More information about the calendarserver-changes mailing list