[CalendarServer-changes] [266] CalDAVTester/trunk/verifiers

[source_changes at macosforge.org]

Revision: 266
          http://trac.macosforge.org/projects/calendarserver/changeset/266
Author:   cdaboo at apple.com
Date:     2006-10-10 10:17:08 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
API change to support new variable substitution mechanism.

Modified Paths:
--------------
    CalDAVTester/trunk/verifiers/aclItems.py
    CalDAVTester/trunk/verifiers/dataMatch.py
    CalDAVTester/trunk/verifiers/dataString.py
    CalDAVTester/trunk/verifiers/freeBusy.py
    CalDAVTester/trunk/verifiers/header.py
    CalDAVTester/trunk/verifiers/multistatusItems.py
    CalDAVTester/trunk/verifiers/prepostcondition.py
    CalDAVTester/trunk/verifiers/propfindItems.py
    CalDAVTester/trunk/verifiers/statusCode.py

Modified: CalDAVTester/trunk/verifiers/aclItems.py
===================================================================
--- CalDAVTester/trunk/verifiers/aclItems.py	2006-10-10 17:10:28 UTC (rev 265)
+++ CalDAVTester/trunk/verifiers/aclItems.py	2006-10-10 17:17:08 UTC (rev 266)
@@ -28,7 +28,7 @@
 
 class Verifier(object):
     
-    def verify(self, uri, response, respdata, args): #@UnusedVariable
+    def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
 
         def ElementsByName(parent, nsURI, localName):
             rc = NodeList()

Modified: CalDAVTester/trunk/verifiers/dataMatch.py
===================================================================
--- CalDAVTester/trunk/verifiers/dataMatch.py	2006-10-10 17:10:28 UTC (rev 265)
+++ CalDAVTester/trunk/verifiers/dataMatch.py	2006-10-10 17:17:08 UTC (rev 266)
@@ -16,15 +16,13 @@
 # DRI: Cyrus Daboo, cdaboo at apple.com
 ##
 
-from tests.serverinfo import serverinfo
-
 """
 Verifier that checks the response body for an exact match to data in a file.
 """
 
 class Verifier(object):
     
-    def verify(self, uri, response, respdata, args): #@UnusedVariable
+    def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
         # Get arguments
         files = args.get("filepath", [])
         
@@ -53,7 +51,7 @@
         if data is None:
             return False, "        Could not read data file"
 
-        data = serverinfo.subs(data)
+        data = manager.server_info.subs(data)
 
         if data != respdata:
             data = data.replace("\n", "\r\n")

Modified: CalDAVTester/trunk/verifiers/dataString.py
===================================================================
--- CalDAVTester/trunk/verifiers/dataString.py	2006-10-10 17:10:28 UTC (rev 265)
+++ CalDAVTester/trunk/verifiers/dataString.py	2006-10-10 17:17:08 UTC (rev 266)
@@ -22,7 +22,7 @@
 
 class Verifier(object):
     
-    def verify(self, uri, response, respdata, args): #@UnusedVariable
+    def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
         # Get arguments
         contains = args.get("contains", [])
         notcontains = args.get("notcontains", [])

Modified: CalDAVTester/trunk/verifiers/freeBusy.py
===================================================================
--- CalDAVTester/trunk/verifiers/freeBusy.py	2006-10-10 17:10:28 UTC (rev 265)
+++ CalDAVTester/trunk/verifiers/freeBusy.py	2006-10-10 17:17:08 UTC (rev 266)
@@ -27,7 +27,7 @@
 
 class Verifier(object):
     
-    def verify(self, uri, response, respdata, args): #@UnusedVariable
+    def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
         
         # Must have status 200
         if response.status != 200:

Modified: CalDAVTester/trunk/verifiers/header.py
===================================================================
--- CalDAVTester/trunk/verifiers/header.py	2006-10-10 17:10:28 UTC (rev 265)
+++ CalDAVTester/trunk/verifiers/header.py	2006-10-10 17:17:08 UTC (rev 266)
@@ -24,7 +24,7 @@
 
 class Verifier(object):
     
-    def verify(self, uri, response, respdata, args): #@UnusedVariable
+    def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
         # Split into header/value tuples
         testheader = args.get("header", [])
         for i in range(len(testheader)):

Modified: CalDAVTester/trunk/verifiers/multistatusItems.py
===================================================================
--- CalDAVTester/trunk/verifiers/multistatusItems.py	2006-10-10 17:10:28 UTC (rev 265)
+++ CalDAVTester/trunk/verifiers/multistatusItems.py	2006-10-10 17:17:08 UTC (rev 266)
@@ -27,7 +27,7 @@
 
 class Verifier(object):
     
-    def verify(self, uri, response, respdata, args):
+    def verify(self, manager, uri, response, respdata, args):
 
         def ElementsByName(parent, nsURI, localName):
             rc = NodeList()

Modified: CalDAVTester/trunk/verifiers/prepostcondition.py
===================================================================
--- CalDAVTester/trunk/verifiers/prepostcondition.py	2006-10-10 17:10:28 UTC (rev 265)
+++ CalDAVTester/trunk/verifiers/prepostcondition.py	2006-10-10 17:17:08 UTC (rev 266)
@@ -25,7 +25,7 @@
 
 class Verifier(object):
     
-    def verify(self, uri, response, respdata, args): #@UnusedVariable
+    def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
         # If no status veriffication requested, then assume all 2xx codes are OK
         teststatus = args.get("error", [])
         

Modified: CalDAVTester/trunk/verifiers/propfindItems.py
===================================================================
--- CalDAVTester/trunk/verifiers/propfindItems.py	2006-10-10 17:10:28 UTC (rev 265)
+++ CalDAVTester/trunk/verifiers/propfindItems.py	2006-10-10 17:17:08 UTC (rev 266)
@@ -28,7 +28,7 @@
 
 class Verifier(object):
     
-    def verify(self, uri, response, respdata, args): #@UnusedVariable
+    def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
         def ElementsByName(parent, nsURI, localName):
             rc = NodeList()
             for node in parent.childNodes:

Modified: CalDAVTester/trunk/verifiers/statusCode.py
===================================================================
--- CalDAVTester/trunk/verifiers/statusCode.py	2006-10-10 17:10:28 UTC (rev 265)
+++ CalDAVTester/trunk/verifiers/statusCode.py	2006-10-10 17:17:08 UTC (rev 266)
@@ -22,7 +22,7 @@
 
 class Verifier(object):
     
-    def verify(self, uri, response, respdata, args): #@UnusedVariable
+    def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
         # If no status veriffication requested, then assume all 2xx codes are OK
         teststatus = args.get("status", ["2xx"])
         

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061010/912b909a/attachment.html