[CalendarServer-changes] [6403] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 6403
          http://trac.macosforge.org/projects/calendarserver/changeset/6403
Author:   cdaboo at apple.com
Date:     2010-10-06 13:24:56 -0700 (Wed, 06 Oct 2010)
Log Message:
-----------
Use a <pause/> element to pause in between <requests>'s.

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

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd	2010-10-06 14:56:16 UTC (rev 6402)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd	2010-10-06 20:24:56 UTC (rev 6403)
@@ -25,6 +25,8 @@
 	<!ELEMENT start (request*)>
 	<!ELEMENT end (request*)>
 
+	<!ELEMENT pause EMPTY>
+
 	<!ELEMENT request (require-feature?, method, ruri*, header*, data?, verify*, grabheader*, grabproperty*, grabelement*)>
 		<!ATTLIST request auth (yes|no) "yes"
 						 user CDATA ""
@@ -59,7 +61,7 @@
 		<!ATTLIST test-suite name CDATA #REQUIRED
 							ignore (yes|no) "no">
 	
-		<!ELEMENT test (require-feature?, description?, request+)>
+		<!ELEMENT test (require-feature?, description?, (request|pause)+)>
 			<!ATTLIST test name CDATA #REQUIRED
 						  count CDATA "1"
 						  stats (yes|no) "no"

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd	2010-10-06 14:56:16 UTC (rev 6402)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd	2010-10-06 20:24:56 UTC (rev 6403)
@@ -25,6 +25,8 @@
 	<!ELEMENT start (request*)>
 	<!ELEMENT end (request*)>
 
+	<!ELEMENT pause EMPTY>
+
 	<!ELEMENT request (require-feature?, method, ruri*, header*, data?, verify*, grabheader*, grabproperty*, grabelement*)>
 		<!ATTLIST request auth (yes|no) "yes"
 						 user CDATA ""
@@ -59,7 +61,7 @@
 		<!ATTLIST test-suite name CDATA #REQUIRED
 							ignore (yes|no) "no">
 	
-		<!ELEMENT test (require-feature?, description?, request+)>
+		<!ELEMENT test (require-feature?, description?, (request|pause)+)>
 			<!ATTLIST test name CDATA #REQUIRED
 						  count CDATA "1"
 						  stats (yes|no) "no"

Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py	2010-10-06 14:56:16 UTC (rev 6402)
+++ CalDAVTester/trunk/src/caldavtest.py	2010-10-06 20:24:56 UTC (rev 6403)
@@ -21,7 +21,7 @@
 from cStringIO import StringIO
 from src.httpshandler import SmartHTTPConnection
 from src.manager import manager
-from src.request import data
+from src.request import data, pause
 from src.request import request
 from src.request import stats
 from src.testsuite import testsuite
@@ -381,6 +381,12 @@
     
     def dorequest( self, req, details=False, doverify = True, forceverify = False, stats = None, etags = None, label = "" ):
         
+        if isinstance(req, pause):
+            # Useful for pausing at a particular point
+            print "Paused"
+            sys.stdin.readline()
+            return True, "", None, None
+            
         if len(req.missingFeatures()) != 0:
             #self.manager.log(manager.LOG_HIGH, "[IGNORED]")
             #self.manager.log(manager.LOG_HIGH, "      Missing features: %s" % (", ".join(sorted(req.missingFeatures())),))

Modified: CalDAVTester/trunk/src/request.py
===================================================================
--- CalDAVTester/trunk/src/request.py	2010-10-06 14:56:16 UTC (rev 6402)
+++ CalDAVTester/trunk/src/request.py	2010-10-06 20:24:56 UTC (rev 6403)
@@ -121,6 +121,9 @@
     respHash = m.digest().encode('hex')
     return respHash
 
+class pause ( object ):
+    pass
+
 class request( object ):
     """
     Represents the HTTP request to be executed, and verifcation information to
@@ -324,6 +327,8 @@
                 req = request(manager)
                 req.parseXML( child )
                 requests.append( req )
+            elif child.tag == src.xmlDefs.ELEMENT_PAUSE:
+                requests.append(pause())
         return requests
                 
     parseList = staticmethod( parseList )

Modified: CalDAVTester/trunk/src/xmlDefs.py
===================================================================
--- CalDAVTester/trunk/src/xmlDefs.py	2010-10-06 14:56:16 UTC (rev 6402)
+++ CalDAVTester/trunk/src/xmlDefs.py	2010-10-06 20:24:56 UTC (rev 6403)
@@ -46,6 +46,7 @@
 ELEMENT_NAME = "name"
 ELEMENT_NOTIFY = "notify"
 ELEMENT_PATH = "path"
+ELEMENT_PAUSE = "pause"
 ELEMENT_PERFINFO = "perfinfo"
 ELEMENT_PERIOD = "period"
 ELEMENT_POPULATE = "populate"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101006/92b28c62/attachment.html>