Revision: 888 http://trac.macosforge.org/projects/calendarserver/changeset/888 Author: cdaboo@apple.com Date: 2006-12-21 19:43:23 -0800 (Thu, 21 Dec 2006) Log Message: ----------- Tweak to allow number of clients to be configured on a per-run basis. Modified Paths: -------------- CalDAVTester/trunk/src/perfinfo.py Modified: CalDAVTester/trunk/src/perfinfo.py =================================================================== --- CalDAVTester/trunk/src/perfinfo.py 2006-12-22 03:41:38 UTC (rev 887) +++ CalDAVTester/trunk/src/perfinfo.py 2006-12-22 03:43:23 UTC (rev 888) @@ -52,26 +52,31 @@ elif child._get_localName() == src.xmlDefs.ELEMENT_SERVERINFO: self.serverinfo = child.firstChild.data elif child._get_localName() == src.xmlDefs.ELEMENT_START: - self.startscript = child.firstChild.data + if child.firstChild is not None: + self.startscript = child.firstChild.data elif child._get_localName() == src.xmlDefs.ELEMENT_TESTINFO: self.testinfo = child.firstChild.data elif child._get_localName() == src.xmlDefs.ELEMENT_END: - self.endscript = child.firstChild.data + if child.firstChild is not None: + self.endscript = child.firstChild.data elif child._get_localName() == src.xmlDefs.ELEMENT_SUBSTITUTIONS: self.parseSubstitutionsXML(child) def parseTestsXML(self, node): for child in node._get_childNodes(): if child._get_localName() == src.xmlDefs.ELEMENT_TEST: + clients = self.clients spread = None runs = None for schild in child._get_childNodes(): - if schild._get_localName() == src.xmlDefs.ELEMENT_SPREAD: + if schild._get_localName() == src.xmlDefs.ELEMENT_CLIENTS: + clients = int(schild.firstChild.data) + elif schild._get_localName() == src.xmlDefs.ELEMENT_SPREAD: spread = float(schild.firstChild.data) elif schild._get_localName() == src.xmlDefs.ELEMENT_RUNS: runs = int(schild.firstChild.data) if spread and runs: - self.tests.append((spread, runs,)) + self.tests.append((clients, spread, runs,)) def parseSubstitutionsXML(self, node): for child in node._get_childNodes():