[CalendarServer-changes] [12544] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:17:45 PDT 2014
Revision: 12544
http://trac.calendarserver.org//changeset/12544
Author: cdaboo at apple.com
Date: 2014-02-03 13:30:41 -0800 (Mon, 03 Feb 2014)
Log Message:
-----------
Make wait count and delay configurable.
Modified Paths:
--------------
CalDAVTester/trunk/README.txt
CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
CalDAVTester/trunk/scripts/server/serverinfo.dtd
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/src/caldavtest.py
CalDAVTester/trunk/src/serverinfo.py
CalDAVTester/trunk/src/xmlDefs.py
Modified: CalDAVTester/trunk/README.txt
===================================================================
--- CalDAVTester/trunk/README.txt 2014-02-03 19:52:23 UTC (rev 12543)
+++ CalDAVTester/trunk/README.txt 2014-02-03 21:30:41 UTC (rev 12544)
@@ -92,7 +92,15 @@
ELEMENT <authtype>
HTTP authentication method to use.
- ELEMENT <waittime>
+ ELEMENT <waitcount>
+ For requests that wait, defines how many iterations to wait for
+ [Default: 120].
+
+ ELEMENT <waitdelay>
+ For requests that wait, defines how long between iterations to
+ wait for in seconds [Default: 0.25].
+
+ ELEMENT <waitsuccess>
For requests with the wait-for-success options, defines how many
seconds to wait [Default: 10].
Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-02-03 19:52:23 UTC (rev 12543)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-02-03 21:30:41 UTC (rev 12544)
@@ -28,6 +28,9 @@
<sslport2>8543</sslport2>
<authtype>basic</authtype>
+
+ <waitcount>120</waitcount>
+ <waitdelay>0.25</waitdelay>
<features>
<!-- Generic WebDAV extensions -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-02-03 19:52:23 UTC (rev 12543)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-02-03 21:30:41 UTC (rev 12544)
@@ -23,6 +23,9 @@
<nonsslport>%(nonsslport)s</nonsslport>
<sslport>%(sslport)s</sslport>
<authtype>%(authtype)s</authtype>
+
+ <waitcount>120</waitcount>
+ <waitdelay>0.25</waitdelay>
<features>
<!-- Generic WebDAV extensions -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo.dtd
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.dtd 2014-02-03 19:52:23 UTC (rev 12543)
+++ CalDAVTester/trunk/scripts/server/serverinfo.dtd 2014-02-03 21:30:41 UTC (rev 12544)
@@ -14,7 +14,8 @@
limitations under the License.
-->
-<!ELEMENT serverinfo (host, nonsslport, sslport, host2?, nonsslport2?, sslport2?, authtype?, waitime?, features?, substitutions)? >
+<!ELEMENT serverinfo (host, nonsslport, sslport, host2?, nonsslport2?, sslport2?, authtype?,
+ waitcount?, waitdelay?, waitsuccess?, features?, substitutions)? >
<!ELEMENT host (#PCDATA)>
<!ELEMENT nonsslport (#PCDATA)>
@@ -23,7 +24,9 @@
<!ELEMENT nonsslport2 (#PCDATA)>
<!ELEMENT sslport2 (#PCDATA)>
<!ELEMENT authtype (#PCDATA)>
- <!ELEMENT waittime (#PCDATA)>
+ <!ELEMENT waitdelay (#PCDATA)>
+ <!ELEMENT waitcount (#PCDATA)>
+ <!ELEMENT waitsuccess (#PCDATA)>
<!ELEMENT features (feature*)>
<!ELEMENT feature (#PCDATA)>
<!ELEMENT substitutions (substitution|repeat)*>
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-02-03 19:52:23 UTC (rev 12543)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-02-03 21:30:41 UTC (rev 12544)
@@ -23,6 +23,9 @@
<nonsslport>8008</nonsslport>
<sslport>8443</sslport>
<authtype>basic</authtype>
+
+ <waitcount>120</waitcount>
+ <waitdelay>0.25</waitdelay>
<features>
<!-- Generic WebDAV extensions -->
Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py 2014-02-03 19:52:23 UTC (rev 12543)
+++ CalDAVTester/trunk/src/caldavtest.py 2014-02-03 21:30:41 UTC (rev 12544)
@@ -206,7 +206,7 @@
reqstats = None
for ctr in range(test.count):
for req_count, req in enumerate(test.requests):
- t = time.time() + (self.manager.server_info.wait if getattr(req, "wait_for_success", False) else 100)
+ t = time.time() + (self.manager.server_info.waitsuccess if getattr(req, "wait_for_success", False) else 100)
while t > time.time():
failed = False
if getattr(req, "iterate_data", False):
@@ -395,7 +395,7 @@
def dowaitcount(self, collection, count, label=""):
- for _ignore in range(120):
+ for _ignore in range(self.manager.server_info.waitcount):
req = request(self.manager)
req.method = "PROPFIND"
req.ruris.append(collection[0])
@@ -424,7 +424,7 @@
if ctr - 1 == count:
return True
- delay = 0.25
+ delay = self.manager.server_info.waitdelay
starttime = time.time()
while (time.time() < starttime + delay):
pass
@@ -434,7 +434,7 @@
def dowaitchanged(self, uri, etag, user, pswd, label=""):
- for _ignore in range(120):
+ for _ignore in range(self.manager.server_info.waitcount):
req = request(self.manager)
req.method = "HEAD"
req.ruris.append(uri)
@@ -453,7 +453,7 @@
break
else:
return False
- delay = 0.25
+ delay = self.manager.server_info.waitdelay
starttime = time.time()
while (time.time() < starttime + delay):
pass
Modified: CalDAVTester/trunk/src/serverinfo.py
===================================================================
--- CalDAVTester/trunk/src/serverinfo.py 2014-02-03 19:52:23 UTC (rev 12543)
+++ CalDAVTester/trunk/src/serverinfo.py 2014-02-03 21:30:41 UTC (rev 12544)
@@ -37,7 +37,9 @@
self.features = set()
self.user = ""
self.pswd = ""
- self.wait = 10
+ self.waitcount = 120
+ self.waitdelay = 0.25
+ self.waitsuccess = 10
self.subsdict = {}
self.extrasubsdict = {}
@@ -145,8 +147,12 @@
self.sslport2 = int(child.text)
elif child.tag == src.xmlDefs.ELEMENT_AUTHTYPE:
self.authtype = child.text.encode("utf-8")
- elif child.tag == src.xmlDefs.ELEMENT_WAITTIME:
- self.wait = int(child.text.encode("utf-8"))
+ elif child.tag == src.xmlDefs.ELEMENT_WAITCOUNT:
+ self.waitcount = int(child.text.encode("utf-8"))
+ elif child.tag == src.xmlDefs.ELEMENT_WAITDELAY:
+ self.waitdelay = float(child.text.encode("utf-8"))
+ elif child.tag == src.xmlDefs.ELEMENT_WAITSUCCESS:
+ self.waitsuccess = int(child.text.encode("utf-8"))
elif child.tag == src.xmlDefs.ELEMENT_FEATURES:
self.parseFeatures(child)
elif child.tag == src.xmlDefs.ELEMENT_SUBSTITUTIONS:
Modified: CalDAVTester/trunk/src/xmlDefs.py
===================================================================
--- CalDAVTester/trunk/src/xmlDefs.py 2014-02-03 19:52:23 UTC (rev 12543)
+++ CalDAVTester/trunk/src/xmlDefs.py 2014-02-03 21:30:41 UTC (rev 12544)
@@ -75,7 +75,9 @@
ELEMENT_VALUE = "value"
ELEMENT_VARIABLE = "variable"
ELEMENT_VERIFY = "verify"
-ELEMENT_WAITTIME = "waittime"
+ELEMENT_WAITCOUNT = "waitcount"
+ELEMENT_WAITDELAY = "waitdelay"
+ELEMENT_WAITSUCCESS = "waitsuccess"
ELEMENT_WARNINGTIME = "warningtime"
ATTR_HOST2 = "host2"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/2a45a62a/attachment.html>
More information about the calendarserver-changes
mailing list