[CalendarServer-changes] [990] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jan 8 18:52:59 PST 2007
Revision: 990
http://trac.macosforge.org/projects/calendarserver/changeset/990
Author: cdaboo at apple.com
Date: 2007-01-08 18:52:59 -0800 (Mon, 08 Jan 2007)
Log Message:
-----------
No need for substitutions.
Modified Paths:
--------------
CalDAVTester/trunk/monitor.py
CalDAVTester/trunk/scripts/monitoring/get.xml
CalDAVTester/trunk/scripts/monitoring/monitorinfo.dtd
CalDAVTester/trunk/scripts/monitoring/monitorinfo.xml
CalDAVTester/trunk/src/monitorinfo.py
Modified: CalDAVTester/trunk/monitor.py
===================================================================
--- CalDAVTester/trunk/monitor.py 2007-01-09 02:27:51 UTC (rev 989)
+++ CalDAVTester/trunk/monitor.py 2007-01-09 02:52:59 UTC (rev 990)
@@ -20,12 +20,13 @@
#
# Runs a series of test suites inb parallel using a thread pool
#
+
+import datetime
import signal
+import sys
import time
-import datetime
-import sys
+import xml.dom.minidom
-import xml.dom.minidom
import src.xmlDefs
from src.manager import manager
@@ -58,9 +59,9 @@
minfo = readXML()
- def doScript(script, dict={}):
+ def doScript(script):
mgr = manager(level=manager.LOG_NONE)
- return mgr.runWithOptions(minfo.serverinfo, "", [script,], dict)
+ return mgr.runWithOptions(minfo.serverinfo, "", [script,], {})
def doStart():
if minfo.startscript:
@@ -82,13 +83,17 @@
try:
while(True):
time.sleep(minfo.period)
- result, timing = doScript(minfo.testinfo, minfo.subsdict)
+ result, timing = doScript(minfo.testinfo)
if minfo.logging:
print "Result: %d, Timing: %.3f" % (result, timing,)
if timing >= minfo.warningtime:
- print "[%s] WARNING: request time (%.3f) exceeds limit (%.3f)" % (str(datetime.datetime.now()), timing, minfo.warningtime,)
+ dt = str(datetime.datetime.now())
+ dt = dt[0:dt.rfind(".")]
+ print "[%s] WARNING: request time (%.3f) exceeds limit (%.3f)" % (dt, timing, minfo.warningtime,)
if result != 0:
- print "[%s] WARNING: request failed" % (str(datetime.datetime.now()),)
+ dt = str(datetime.datetime.now())
+ dt = dt[0:dt.rfind(".")]
+ print "[%s] WARNING: request failed" % (dt,)
if minfo.logging:
print "Done"
except SystemExit:
Modified: CalDAVTester/trunk/scripts/monitoring/get.xml
===================================================================
--- CalDAVTester/trunk/scripts/monitoring/get.xml 2007-01-09 02:27:51 UTC (rev 989)
+++ CalDAVTester/trunk/scripts/monitoring/get.xml 2007-01-09 02:52:59 UTC (rev 990)
@@ -21,38 +21,11 @@
-->
<monitorinfo>
- <logging enable="yes"/>
+ <logging enable="no"/>
<period>1.0</period>
<serverinfo>scripts/server/serverinfo-monitor.xml</serverinfo>
<start>monitor/get/get-start.xml</start>
<testinfo>monitor/get/get-small.xml</testinfo>
<end>monitor/get/get-end.xml</end>
<warningtime>1.0</warningtime>
- <substitutions>
- <!-- first user id -->
- <substitution>
- <key>$userid1:</key>
- <value>admin</value>
- </substitution>
- <!-- password for first user -->
- <substitution>
- <key>$pswd1:</key>
- <value>admin</value>
- </substitution>
- <!-- relative path to first user principal resource-->
- <substitution>
- <key>$principal:</key>
- <value>/principals/user/admin/</value>
- </substitution>
- <!-- relative path to first user calendar home-->
- <substitution>
- <key>$pathprefix:</key>
- <value>/calendars/user/admin</value>
- </substitution>
- <!-- relative path to first user calendar home-->
- <substitution>
- <key>$calendarpath1:</key>
- <value>/calendars/user/admin/calendar</value>
- </substitution>
- </substitutions>
</monitorinfo>
Modified: CalDAVTester/trunk/scripts/monitoring/monitorinfo.dtd
===================================================================
--- CalDAVTester/trunk/scripts/monitoring/monitorinfo.dtd 2007-01-09 02:27:51 UTC (rev 989)
+++ CalDAVTester/trunk/scripts/monitoring/monitorinfo.dtd 2007-01-09 02:52:59 UTC (rev 990)
@@ -16,7 +16,7 @@
DRI: Cyrus Daboo, cdaboo at apple.com
-->
-<!ELEMENT monitorinfo (logging, period, serverinfo, start, testinfo, end, warningtime, substitutions)? >
+<!ELEMENT monitorinfo (logging, period, serverinfo, start, testinfo, end, warningtime)? >
<!ELEMENT logging EMPTY>
<!ATTLIST logging enable (yes|no) "no">
@@ -32,9 +32,3 @@
<!ELEMENT end (#PCDATA)>
<!ELEMENT warningtime (#PCDATA)>
-
- <!ELEMENT substitutions (substitution*)>
- <!ELEMENT substitution (key, value)>
- <!ELEMENT key (#PCDATA)>
- <!ELEMENT value (#PCDATA)>
-
Modified: CalDAVTester/trunk/scripts/monitoring/monitorinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/monitoring/monitorinfo.xml 2007-01-09 02:27:51 UTC (rev 989)
+++ CalDAVTester/trunk/scripts/monitoring/monitorinfo.xml 2007-01-09 02:52:59 UTC (rev 990)
@@ -28,31 +28,4 @@
<testinfo>monitor/get/get.xml</testinfo>
<end/>
<warningtime>1.0</warningtime>
- <substitutions>
- <!-- first user id -->
- <substitution>
- <key>$userid1:</key>
- <value>admin</value>
- </substitution>
- <!-- password for first user -->
- <substitution>
- <key>$pswd1:</key>
- <value>admin</value>
- </substitution>
- <!-- relative path to first user principal resource-->
- <substitution>
- <key>$principal:</key>
- <value>/principals/user/admin/</value>
- </substitution>
- <!-- relative path to first user calendar home-->
- <substitution>
- <key>$pathprefix:</key>
- <value>/calendars/user/admin</value>
- </substitution>
- <!-- relative path to first user calendar home-->
- <substitution>
- <key>$calendarpath1:</key>
- <value>/calendars/user/admin/calendar</value>
- </substitution>
- </substitutions>
</monitorinfo>
Modified: CalDAVTester/trunk/src/monitorinfo.py
===================================================================
--- CalDAVTester/trunk/src/monitorinfo.py 2007-01-09 02:27:51 UTC (rev 989)
+++ CalDAVTester/trunk/src/monitorinfo.py 2007-01-09 02:52:59 UTC (rev 990)
@@ -26,7 +26,7 @@
"""
Maintains information about the monitoring test scenario.
"""
- __slots__ = ['logging', 'period', 'serverinfo', 'startscript', 'testinfo', 'endscript', 'warningtime', 'subsdict']
+ __slots__ = ['logging', 'period', 'serverinfo', 'startscript', 'testinfo', 'endscript', 'warningtime']
def __init__( self ):
self.logging = False
@@ -36,7 +36,6 @@
self.testinfo = ""
self.endscript = ""
self.warningtime = 1.0
- self.subsdict = {}
def parseXML( self, node ):
for child in node._get_childNodes():
@@ -56,18 +55,3 @@
self.endscript = child.firstChild.data
elif child._get_localName() == src.xmlDefs.ELEMENT_WARNINGTIME:
self.warningtime = float(child.firstChild.data)
- elif child._get_localName() == src.xmlDefs.ELEMENT_SUBSTITUTIONS:
- self.parseSubstitutionsXML(child)
-
- def parseSubstitutionsXML(self, node):
- for child in node._get_childNodes():
- if child._get_localName() == src.xmlDefs.ELEMENT_SUBSTITUTION:
- key = None
- value = None
- for schild in child._get_childNodes():
- if schild._get_localName() == src.xmlDefs.ELEMENT_KEY:
- key = schild.firstChild.data
- elif schild._get_localName() == src.xmlDefs.ELEMENT_VALUE:
- value = schild.firstChild.data
- if key and value:
- self.subsdict[key] = value
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070108/2915f8b9/attachment.html
More information about the calendarserver-changes
mailing list