[CalendarServer-changes] [8303] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 8303
          http://trac.macosforge.org/projects/calendarserver/changeset/8303
Author:   cdaboo at apple.com
Date:     2011-11-16 12:30:44 -0800 (Wed, 16 Nov 2011)
Log Message:
-----------
Fix for indeterministic search results when truncating.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml
    CalDAVTester/trunk/verifiers/multistatusItems.py

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml	2011-11-16 20:17:20 UTC (rev 8302)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml	2011-11-16 20:30:44 UTC (rev 8303)
@@ -617,8 +617,8 @@
 						<value/>
 					</arg>
 					<arg>
-						<name>okhrefs</name>
-						<value>$principaluri_admin:</value>
+						<name>responsecount</name>
+						<value>2</value>
 					</arg>
 					<arg>
 						<name>badhrefs</name>

Modified: CalDAVTester/trunk/verifiers/multistatusItems.py
===================================================================
--- CalDAVTester/trunk/verifiers/multistatusItems.py	2011-11-16 20:17:20 UTC (rev 8302)
+++ CalDAVTester/trunk/verifiers/multistatusItems.py	2011-11-16 20:30:44 UTC (rev 8303)
@@ -39,6 +39,7 @@
                 pass
         count = args.get("count", [])
         totalcount = args.get("totalcount", [])
+        responsecount = args.get("responsecount", [])
         prefix = args.get("prefix", [])
         ignoremissing = args.get("ignoremissing", [])
         if len(prefix):
@@ -53,6 +54,7 @@
             args[k] = v
         count = [int(i) for i in count]
         totalcount = [int(i) for i in totalcount]
+        responsecount = [int(i) for i in responsecount]
         
         if "okhrefs" in args or "nohrefs" in args or "badhrefs" in args:
             doOKBad = True
@@ -133,6 +135,14 @@
                 resulttxt +=  "        %d items returned, but %d items expected" % (len(ok_result_set), totalcount[0], )
             return result, resulttxt
 
+        # Check for response count
+        if len(responsecount) == 1:
+            responses = len(ok_result_set) + len(bad_result_set)
+            if responses != responsecount[0]:
+                result = False
+                resulttxt +=  "        %d responses returned, but %d responses expected" % (responses, responsecount[0], )
+            return result, resulttxt
+
         if doOKBad:
             # Now do set difference
             ok_missing = ok_test_set.difference( ok_result_set )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111116/dd1354f0/attachment.html>