[CalendarServer-changes] [9789] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 9789
          http://trac.macosforge.org/projects/calendarserver/changeset/9789
Author:   cdaboo at apple.com
Date:     2012-09-07 12:11:00 -0700 (Fri, 07 Sep 2012)
Log Message:
-----------
New option to grab the GETNEW uri found for later use.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd
    CalDAVTester/trunk/src/caldavtest.py
    CalDAVTester/trunk/src/request.py
    CalDAVTester/trunk/src/xmlDefs.py

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2012-09-07 16:30:40 UTC (rev 9788)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2012-09-07 19:11:00 UTC (rev 9789)
@@ -22,7 +22,7 @@
 	<host>localhost</host>
 	<nonsslport>8008</nonsslport>
 	<sslport>8443</sslport>
-	<authtype>digest</authtype>
+	<authtype>basic</authtype>
 
 	<features>
 		<!--  Generic WebDAV extensions -->

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd	2012-09-07 16:30:40 UTC (rev 9788)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd	2012-09-07 19:11:00 UTC (rev 9789)
@@ -29,7 +29,7 @@
 
 	<!ELEMENT pause EMPTY>
 
-	<!ELEMENT request (require-feature?, exclude-feature?, method, ruri*, header*, data?, verify*, grabheader*, grabproperty*, grabelement*)>
+	<!ELEMENT request (require-feature?, exclude-feature?, method, ruri*, header*, data?, verify*, graburi?, grabheader*, grabproperty*, grabelement*)>
 		<!ATTLIST request auth (yes|no) "yes"
 						 user CDATA ""
 						 pswd CDATA ""
@@ -52,6 +52,8 @@
 				<!ELEMENT callback (#PCDATA)>
 				<!ELEMENT arg (name, value*)>
 		
+		<!ELEMENT graburi (#PCDATA)>
+
 		<!ELEMENT grabheader (name, variable)>
 	
 		<!ELEMENT grabproperty (property, variable)>

Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py	2012-09-07 16:30:40 UTC (rev 9788)
+++ CalDAVTester/trunk/src/caldavtest.py	2012-09-07 19:11:00 UTC (rev 9789)
@@ -569,6 +569,9 @@
             if hdrs:
                 etags[uri] = hdrs[0].encode("utf-8")
 
+        if req.graburi:
+            self.manager.server_info.addextrasubs({req.graburi: self.grabbedlocation})
+            
         if req.grabheader:
             for hdrname, variable in req.grabheader:
                 hdrs = response.msg.getheaders(hdrname)

Modified: CalDAVTester/trunk/src/request.py
===================================================================
--- CalDAVTester/trunk/src/request.py	2012-09-07 16:30:40 UTC (rev 9788)
+++ CalDAVTester/trunk/src/request.py	2012-09-07 19:11:00 UTC (rev 9789)
@@ -150,6 +150,7 @@
         self.data = None
         self.count = 1
         self.verifiers = []
+        self.graburi = None
         self.grabheader = []
         self.grabproperty = []
         self.grabelement = []
@@ -324,6 +325,8 @@
             elif child.tag == src.xmlDefs.ELEMENT_VERIFY:
                 self.verifiers.append(verify(self.manager))
                 self.verifiers[-1].parseXML( child )
+            elif child.tag == src.xmlDefs.ELEMENT_GRABURI:
+                self.graburi = child.text.encode("utf-8")
             elif child.tag == src.xmlDefs.ELEMENT_GRABHEADER:
                 self.parseGrab(child, self.grabheader)
             elif child.tag == src.xmlDefs.ELEMENT_GRABPROPERTY:

Modified: CalDAVTester/trunk/src/xmlDefs.py
===================================================================
--- CalDAVTester/trunk/src/xmlDefs.py	2012-09-07 16:30:40 UTC (rev 9788)
+++ CalDAVTester/trunk/src/xmlDefs.py	2012-09-07 19:11:00 UTC (rev 9789)
@@ -33,6 +33,7 @@
 ELEMENT_GRABELEMENT = "grabelement"
 ELEMENT_GRABHEADER = "grabheader"
 ELEMENT_GRABPROPERTY = "grabproperty"
+ELEMENT_GRABURI = "graburi"
 ELEMENT_HEADER = "header"
 ELEMENT_HOST = "host"
 ELEMENT_KEY = "key"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120907/5f06efc3/attachment.html>