[CalendarServer-changes] [3116] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Sun Oct 5 17:30:01 PDT 2008
Revision: 3116
http://trac.macosforge.org/projects/calendarserver/changeset/3116
Author: cdaboo at apple.com
Date: 2008-10-05 17:30:00 -0700 (Sun, 05 Oct 2008)
Log Message:
-----------
Minor code clean-up.
Modified Paths:
--------------
CalDAVTester/trunk/buildperformer.py
CalDAVTester/trunk/fsusage.py
CalDAVTester/trunk/performer.py
CalDAVTester/trunk/src/caldavtest.py
CalDAVTester/trunk/src/perfinfo.py
CalDAVTester/trunk/src/request.py
CalDAVTester/trunk/src/sendemail.py
CalDAVTester/trunk/verifiers/header.py
Modified: CalDAVTester/trunk/buildperformer.py
===================================================================
--- CalDAVTester/trunk/buildperformer.py 2008-10-05 23:50:04 UTC (rev 3115)
+++ CalDAVTester/trunk/buildperformer.py 2008-10-06 00:30:00 UTC (rev 3116)
@@ -23,7 +23,7 @@
import sys
def human_readable(item, avg, stddev, total):
- print "\t%s\t%.3f\t%.3f\t%.3f" % (item, avg, stddev, total)
+ print "\t%s\t%.3f\t%.3f\t%.3f" % (item, avg, stddev, total)
def main(logger):
@@ -35,7 +35,7 @@
)
for item in performs:
- pinfo, result = performer.runIt(item, silent=True)
+ _ignore_pinfo, result = performer.runIt(item, silent=True)
if result[0][0] == -1.0 or result[0][1] == -1.0 or result[0][2] == -1.0:
print "Failed: got result -1.0 for test script %s" % (item,)
sys.exit(1)
Modified: CalDAVTester/trunk/fsusage.py
===================================================================
--- CalDAVTester/trunk/fsusage.py 2008-10-05 23:50:04 UTC (rev 3115)
+++ CalDAVTester/trunk/fsusage.py 2008-10-06 00:30:00 UTC (rev 3116)
@@ -45,13 +45,13 @@
fnames = [testscript]
mgr = manager(level=manager.LOG_NONE)
- result, timing = mgr.runWithOptions(sname, pname, fnames, {})
+ _ignore_result, _ignore_timing = mgr.runWithOptions(sname, pname, fnames, {})
os.kill(cid, signal.SIGTERM)
fd = open(tmpfile, "r")
ctr = 0
- for line in fd:
+ for _ignore_line in fd:
ctr += 1
return ctr / runs
Modified: CalDAVTester/trunk/performer.py
===================================================================
--- CalDAVTester/trunk/performer.py 2008-10-05 23:50:04 UTC (rev 3115)
+++ CalDAVTester/trunk/performer.py 2008-10-06 00:30:00 UTC (rev 3116)
@@ -69,7 +69,7 @@
print "Start: %s" % (args[0]["moresubs"]["$userid1:"],)
try:
mgr = manager(level=manager.LOG_NONE)
- result, timing = mgr.runWithOptions(*args[1:], **args[0])
+ _ignore_result, _ignore_timing = mgr.runWithOptions(*args[1:], **args[0])
if pinfo.logging:
print "Done: %s" % (args[0]["moresubs"]["$userid1:"],)
except Exception, e:
@@ -110,7 +110,7 @@
result = [0.0, 0.0, 0.0]
if not silent:
print "|",
- for loop in range(test[2]):
+ for _ignore_loop in range(test[2]):
if not silent:
print ".",
results = []
Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py 2008-10-05 23:50:04 UTC (rev 3115)
+++ CalDAVTester/trunk/src/caldavtest.py 2008-10-06 00:30:00 UTC (rev 3116)
@@ -131,7 +131,7 @@
reqstats = None
for ctr in range(test.count): #@UnusedVariable
for req in test.requests:
- result, resulttxt, response, respdata = self.dorequest( req, test.details, True, False, reqstats )
+ result, resulttxt, _ignore_response, _ignore_respdata = self.dorequest( req, test.details, True, False, reqstats )
if not result:
break
loglevel = [manager.LOG_ERROR, manager.LOG_HIGH][result]
@@ -150,7 +150,7 @@
self.manager.log(manager.LOG_HIGH, description, before=1, after=0)
ctr = 1
for req in list:
- result, resulttxt, response, respdata = self.dorequest( req, False, doverify, forceverify )
+ result, resulttxt, _ignore_response, _ignore_respdata = self.dorequest( req, False, doverify, forceverify )
if not result:
resulttxt += "\nFailure during multiple requests #%d out of %d, request=%s" % (ctr, len(list), str(req))
break
@@ -180,7 +180,7 @@
</D:propfind>
"""
req.data.content_type = "text/xml"
- result, resulttxt, response, respdata = self.dorequest( req, False, False )
+ result, _ignore_resulttxt, response, respdata = self.dorequest( req, False, False )
if result and (response is not None) and (response.status == 207) and (respdata is not None):
doc = xml.dom.minidom.parseString( respdata )
@@ -238,7 +238,7 @@
</D:propfind>
"""
req.data.content_type = "text/xml"
- result, resulttxt, response, respdata = self.dorequest( req, False, False )
+ result, _ignore_resulttxt, response, respdata = self.dorequest( req, False, False )
if result and (response is not None) and (response.status == 207) and (respdata is not None):
doc = xml.dom.minidom.parseString( respdata )
Modified: CalDAVTester/trunk/src/perfinfo.py
===================================================================
--- CalDAVTester/trunk/src/perfinfo.py 2008-10-05 23:50:04 UTC (rev 3115)
+++ CalDAVTester/trunk/src/perfinfo.py 2008-10-06 00:30:00 UTC (rev 3116)
@@ -159,7 +159,7 @@
print "Start: %s" % (args[0]["moresubs"]["$userid1:"],)
try:
mgr = manager(level=manager.LOG_NONE)
- result, timing = mgr.runWithOptions(*args[1:], **args[0])
+ _ignore_result, _ignore_timing = mgr.runWithOptions(*args[1:], **args[0])
if self.logging:
print "Done: %s" % (args[0]["moresubs"]["$userid1:"],)
except Exception, e:
Modified: CalDAVTester/trunk/src/request.py
===================================================================
--- CalDAVTester/trunk/src/request.py 2008-10-05 23:50:04 UTC (rev 3115)
+++ CalDAVTester/trunk/src/request.py 2008-10-06 00:30:00 UTC (rev 3116)
@@ -296,9 +296,9 @@
name = None
value = None
for child in node._get_childNodes():
- if child._get_localName() == src.xmlDefs.ELEMENT_NAME:
+ if child._get_localName() == src.xmlDefs.ELEMENT_NAME:
name = child.firstChild.data.encode("utf-8")
- elif child._get_localName() == src.xmlDefs.ELEMENT_VALUE:
+ elif child._get_localName() == src.xmlDefs.ELEMENT_VALUE:
value = self.manager.server_info.subs(child.firstChild.data.encode("utf-8"))
if (name is not None) and (value is not None):
@@ -320,9 +320,9 @@
property = None
variable = None
for child in node._get_childNodes():
- if child._get_localName() == src.xmlDefs.ELEMENT_PROPERTY:
+ if child._get_localName() == src.xmlDefs.ELEMENT_PROPERTY:
property = child.firstChild.data.encode("utf-8")
- elif child._get_localName() == src.xmlDefs.ELEMENT_VARIABLE:
+ elif child._get_localName() == src.xmlDefs.ELEMENT_VARIABLE:
variable = self.manager.server_info.subs(child.firstChild.data.encode("utf-8"))
if (property is not None) and (variable is not None):
Modified: CalDAVTester/trunk/src/sendemail.py
===================================================================
--- CalDAVTester/trunk/src/sendemail.py 2008-10-05 23:50:04 UTC (rev 3115)
+++ CalDAVTester/trunk/src/sendemail.py 2008-10-06 00:30:00 UTC (rev 3116)
@@ -18,10 +18,7 @@
Send an email message.
"""
-try:
- from email.mime.text import MIMEText
-except:
- from email.MIMEText import MIMEText
+from email.mime.text import MIMEText
import smtplib
def sendemail(fromaddr=("", ""), toaddrs=[], subject="", body=""):
Modified: CalDAVTester/trunk/verifiers/header.py
===================================================================
--- CalDAVTester/trunk/verifiers/header.py 2008-10-05 23:50:04 UTC (rev 3115)
+++ CalDAVTester/trunk/verifiers/header.py 2008-10-06 00:30:00 UTC (rev 3116)
@@ -70,9 +70,9 @@
if (test[1] is not None):
matched = False
for hdr in hdrs:
- if (re.match(test[1], hdr) is not None):
- matched = True
- break
+ if (re.match(test[1], hdr) is not None):
+ matched = True
+ break
if not matched:
result = False
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081005/d6ba76ac/attachment.html
More information about the calendarserver-changes
mailing list