[CalendarServer-changes] [1007] CalDAVTester/trunk/verifiers/header.py

[source_changes at macosforge.org]

Revision: 1007
          http://trac.macosforge.org/projects/calendarserver/changeset/1007
Author:   cdaboo at apple.com
Date:     2007-01-10 09:10:02 -0800 (Wed, 10 Jan 2007)

Log Message:
-----------
Allow a test against a header that could occur multiple times.

Modified Paths:
--------------
    CalDAVTester/trunk/verifiers/header.py

Modified: CalDAVTester/trunk/verifiers/header.py
===================================================================
--- CalDAVTester/trunk/verifiers/header.py	2007-01-10 03:14:48 UTC (rev 1006)
+++ CalDAVTester/trunk/verifiers/header.py	2007-01-10 17:10:02 UTC (rev 1007)
@@ -29,10 +29,13 @@
         testheader = args.get("header", [])[:]
         for i in range(len(testheader)):
             p = testheader[i]
-            present = True
+            present = "single"
             if p[0] == "!":
                 p = p[1:]
-                present = False
+                present = "none"
+            if p[0] == "*":
+                p = p[1:]
+                present = "multiple"
             if p.find("$") != -1:
                 testheader[i] = (p.split("$", 1)[0], p.split("$", 1)[1], present,)
             else:
@@ -52,25 +55,32 @@
                 else:
                     continue
 
-            if (hdrs is not None) and (len(hdrs) != 0) and not test[2]:
+            if (hdrs is not None) and (len(hdrs) != 0) and (test[2] == "none"):
                 result = False
                 if len(resulttxt):
                     resulttxt += "\n"
                 resulttxt += "        Response Header was present one or more times: %s" % (test[0],)
                 continue
                
-            if len(hdrs) != 1:
+            if (len(hdrs) != 1) and (test[2] == "single"):
                 result = False
                 if len(resulttxt):
                     resulttxt += "\n"
                 resulttxt += "        Multiple Response Headers: %s" % (test[0],)
                 continue
-            if (test[1] is not None) and (re.match(test[1], hdrs[0]) is None):
-                result = False
-                if len(resulttxt):
-                    resulttxt += "\n"
-                resulttxt += "        Wrong Response Header Value: %s: %s" % (test[0], hdrs[0])
-                continue
+            
+            if (test[1] is not None):
+                matched = False
+                for hdr in hdrs:
+                     if (re.match(test[1], hdr) is not None):
+                         matched = True
+                         break
+                        
+                if not matched:
+                    result = False
+                    if len(resulttxt):
+                        resulttxt += "\n"
+                    resulttxt += "        Wrong Response Header Value: %s: %s" % (test[0], str(hdrs))
 
         return result, resulttxt
             

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070110/114fa8ee/attachment.html