[CalendarServer-changes] [6634] CalDAVTester/trunk/src
source_changes at macosforge.org
source_changes at macosforge.org
Mon Nov 15 12:00:33 PST 2010
Revision: 6634
http://trac.macosforge.org/projects/calendarserver/changeset/6634
Author: cdaboo at apple.com
Date: 2010-11-15 12:00:30 -0800 (Mon, 15 Nov 2010)
Log Message:
-----------
Remove the "populate" feature that has not been used in a while and is broken anyway.
Modified Paths:
--------------
CalDAVTester/trunk/src/manager.py
CalDAVTester/trunk/src/xmlDefs.py
Modified: CalDAVTester/trunk/src/manager.py
===================================================================
--- CalDAVTester/trunk/src/manager.py 2010-11-15 18:37:27 UTC (rev 6633)
+++ CalDAVTester/trunk/src/manager.py 2010-11-15 20:00:30 UTC (rev 6634)
@@ -18,7 +18,6 @@
Class to manage the testing process.
"""
-from src.populate import populate
from src.serverinfo import serverinfo
from xml.etree.ElementTree import ElementTree
from xml.parsers.expat import ExpatError
@@ -49,8 +48,6 @@
def __init__( self, text=True, level=LOG_HIGH, log_file=None ):
self.server_info = serverinfo()
- self.populator = None
- self.depopulate = False
self.tests = []
self.textMode = text
self.pid = 0
@@ -76,7 +73,7 @@
else:
print str,
- def readXML( self, serverfile, populatorfile, testfiles, all, moresubs = {} ):
+ def readXML( self, serverfile, testfiles, all, moresubs = {} ):
self.log(manager.LOG_HIGH, "Reading Server Info from \"%s\"" % serverfile, after=2)
@@ -95,24 +92,6 @@
self.server_info.parseXML(serverinfo_node)
self.server_info.addsubs(moresubs)
- # Open and parse the populator config file
- if populatorfile:
- self.log(manager.LOG_HIGH, "Reading Populator Info from \"%s\"" % populatorfile, after=2)
-
- try:
- tree = ElementTree(file=populatorfile)
- except ExpatError, e:
- raise RuntimeError("Unable to parse file '%s' because: %s" % (populatorfile, e,))
-
- # Verify that top-level element is correct
- populate_node = tree.getroot()
- if populate_node.tag != src.xmlDefs.ELEMENT_POPULATE:
- raise EX_INVALID_CONFIG_FILE
- if not len(populate_node):
- raise EX_INVALID_CONFIG_FILE
- self.populator = populate(self)
- self.populator.parseXML(populate_node)
-
for testfile in testfiles:
# Open and parse the config file
try:
@@ -140,7 +119,6 @@
def readCommandLine(self):
sname = "scripts/server/serverinfo.xml"
- pname = None
dname = "scripts/tests"
fnames = []
all = False
@@ -149,16 +127,12 @@
pidfile = "../CalendarServer/logs/caldavd.pid"
random_order = False
random_seed = str(random.randint(0, 1000000))
- options, args = getopt.getopt(sys.argv[1:], "s:p:dmx:", ["all", "subdir=", "exclude=", "pid=", "postgres-log=", "random", "random-seed="])
+ options, args = getopt.getopt(sys.argv[1:], "s:mx:", ["all", "subdir=", "exclude=", "pid=", "postgres-log=", "random", "random-seed="])
# Process single options
for option, value in options:
if option == "-s":
sname = value
- elif option == "-p":
- pname = value
- elif option == "-d":
- self.depopulate = True
elif option == "-x":
dname = value
elif option == "--all":
@@ -187,7 +161,7 @@
fnames.append(file)
# Remove any server info file from files enumerated by --all
- fnames[:] = [x for x in fnames if (x != sname) and (not pname or (x != pname))]
+ fnames[:] = [x for x in fnames if (x != sname)]
# Process any file arguments as test configs
for f in args:
@@ -201,25 +175,21 @@
random.seed(random_seed)
random.shuffle(fnames)
- self.readXML(sname, pname, fnames, all)
+ self.readXML(sname, fnames, all)
if self.memUsage:
fd = open(pidfile, "r")
s = fd.read()
self.pid = int(s)
- def runWithOptions(self, sname, pname, fnames, moresubs, pid=0, memUsage=False, all = False, depopulate = False):
- self.depopulate = depopulate
- self.readXML(sname, pname, fnames, all, moresubs)
+ def runWithOptions(self, sname, fnames, moresubs, pid=0, memUsage=False, all = False):
+ self.readXML(sname, fnames, all, moresubs)
self.pid = pid
self.memUsage = memUsage
return self.runAll()
def runAll(self):
- if self.populator:
- self.runPopulate();
-
startTime = time.time()
ok = 0
failed = 0
@@ -237,20 +207,11 @@
endTime = time.time()
- if self.populator and self.depopulate:
- self.runDepopulate()
-
self.log(manager.LOG_LOW, "Overall Results: %d PASSED, %d FAILED, %d IGNORED" % (ok, failed, ignored), before=2, indent=4)
self.log(manager.LOG_LOW, "Total time: %.3f secs" % (endTime- startTime,))
return failed, endTime - startTime
- def runPopulate(self):
- self.populator.generateAccounts()
-
- def runDepopulate(self):
- self.populator.removeAccounts()
-
def httpRequest(self, method, uri, headers, data):
# Do the http request
Modified: CalDAVTester/trunk/src/xmlDefs.py
===================================================================
--- CalDAVTester/trunk/src/xmlDefs.py 2010-11-15 18:37:27 UTC (rev 6633)
+++ CalDAVTester/trunk/src/xmlDefs.py 2010-11-15 20:00:30 UTC (rev 6634)
@@ -16,17 +16,14 @@
# XML Elements/Attributes
-ELEMENT_ACCOUNT = "account"
ELEMENT_ARG = "arg"
ELEMENT_AUTHTYPE = "authtype"
ELEMENT_BODY = "body"
ELEMENT_CALDAVTEST = "caldavtest"
-ELEMENT_CALENDARS = "calendars"
ELEMENT_CALLBACK = "callback"
ELEMENT_CLIENTS = "clients"
ELEMENT_CONTENTTYPE = "content-type"
ELEMENT_DATA = "data"
-ELEMENT_DATASOURCE = "datasource"
ELEMENT_DESCRIPTION = "description"
ELEMENT_END = "end"
ELEMENT_FEATURES = "features"
@@ -45,11 +42,9 @@
ELEMENT_MONITORINFO = "monitorinfo"
ELEMENT_NAME = "name"
ELEMENT_NOTIFY = "notify"
-ELEMENT_PATH = "path"
ELEMENT_PAUSE = "pause"
ELEMENT_PERFINFO = "perfinfo"
ELEMENT_PERIOD = "period"
-ELEMENT_POPULATE = "populate"
ELEMENT_PORT = "port"
ELEMENT_PROPERTY = "property"
ELEMENT_REPEAT = "repeat"
@@ -77,14 +72,12 @@
ATTR_AUTH = "auth"
ATTR_COUNT = "count"
-ATTR_COUNTARG = "countarg"
ATTR_DETAILS = "details"
ATTR_ENABLE = "enable"
ATTR_END_DELETE = "end-delete"
ATTR_IGNORE = "ignore"
ATTR_IGNORE_ALL = "ignore-all"
ATTR_INTERVAL = "interval"
-ATTR_MODE = "mode"
ATTR_NAME = "name"
ATTR_PRINT_RESPONSE = "print-response"
ATTR_PSWD = "pswd"
@@ -94,10 +87,6 @@
ATTR_TIME_EXCEEDED = "time-exceeded"
ATTR_USER = "user"
-ATTR_DEFAULT_COUNT = 1
-ATTR_DEFAULT_COUNTARG = "%ctr"
-
-ATTR_VALUE_ALL = "all"
ATTR_VALUE_NO = "no"
ATTR_VALUE_RANDOM = "random"
ATTR_VALUE_YES = "yes"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101115/46587563/attachment-0001.html>
More information about the calendarserver-changes
mailing list