[CalendarServer-changes] [14349] CalDAVTester/trunk/src
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jan 27 16:51:37 PST 2015
Revision: 14349
http://trac.calendarserver.org//changeset/14349
Author: cdaboo at apple.com
Date: 2015-01-27 16:51:37 -0800 (Tue, 27 Jan 2015)
Log Message:
-----------
A add bit of py2.6 compatibility.
Modified Paths:
--------------
CalDAVTester/trunk/src/caldavtest.py
CalDAVTester/trunk/src/manager.py
CalDAVTester/trunk/src/observers/log.py
CalDAVTester/trunk/src/serverinfo.py
Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py 2015-01-27 18:39:08 UTC (rev 14348)
+++ CalDAVTester/trunk/src/caldavtest.py 2015-01-28 00:51:37 UTC (rev 14349)
@@ -106,7 +106,7 @@
# Always need a new set of UIDs for the entire test
uids = self.manager.server_info.newUIDs()
for uid, uidname in uids:
- self.uidmaps[uid] = "{} - {}".format(uidname, self.name)
+ self.uidmaps[uid] = "{u} - {n}".format(u=uidname, n=self.name)
self.only = any([suite.only for suite in self.suites])
try:
@@ -164,7 +164,7 @@
testsuite = self.manager.testSuite(testfile, result_name, "")
uids = suite.aboutToRun()
for uid, uidname in uids:
- self.uidmaps[uid] = "{} - {}".format(uidname, label)
+ self.uidmaps[uid] = "{u} - {l}".format(u=uidname, l=label)
for test in suite.tests:
result = self.run_test(testsuite, test, etags, only_tests, label="%s | %s" % (label, test.name))
if result == "t":
@@ -470,7 +470,7 @@
test = self.uidmaps.get(uid, "unknown")
else:
test = "unknown"
- rdata += "\n\nhref: {}\ntest: {}\n\n{}\n".format(href, test, respdata)
+ rdata += "\n\nhref: {h}\ntest: {t}\n\n{r}\n".format(h=href, t=test, r=respdata)
return False, rdata
else:
@@ -546,7 +546,7 @@
collection = (ruri, req.user, req.pswd)
hrefs = self.dofindall(collection, label="%s | %s" % (label, "DELETEALL"))
if not self.dodeleteall(hrefs, label="%s | %s" % (label, "DELETEALL")):
- return False, "DELETEALL failed for: {}".format(ruri), None, None
+ return False, "DELETEALL failed for: {r}".format(r=ruri), None, None
return True, "", None, None
# Special for delay
@@ -591,7 +591,7 @@
collection = (ruri, req.user, req.pswd)
waitresult, waitdetails = self.dowaitcount(collection, count, label=label)
if not waitresult:
- return False, "Count did not change: {}".format(waitdetails), None, None
+ return False, "Count did not change: {w}".format(w=waitdetails), None, None
else:
return True, "", None, None
@@ -605,7 +605,7 @@
hrefs = self.dofindall(collection, label="%s | %s" % (label, "DELETEALL"))
self.dodeleteall(hrefs, label="%s | %s" % (label, "DELETEALL"))
else:
- return False, "Count did not change: {}".format(waitdetails), None, None
+ return False, "Count did not change: {w}".format(w=waitdetails), None, None
else:
return True, "", None, None
Modified: CalDAVTester/trunk/src/manager.py
===================================================================
--- CalDAVTester/trunk/src/manager.py 2015-01-27 18:39:08 UTC (rev 14348)
+++ CalDAVTester/trunk/src/manager.py 2015-01-28 00:51:37 UTC (rev 14349)
@@ -129,7 +129,7 @@
def readXML(self, serverfile, testfiles, ssl, all, moresubs={}):
- self.message("trace", "Reading Server Info from \"{}\"".format(serverfile))
+ self.message("trace", "Reading Server Info from \"{s}\"".format(s=serverfile))
# Open and parse the server config file
try:
@@ -176,14 +176,14 @@
caldavtest_node = tree.getroot()
if caldavtest_node.tag != src.xmlDefs.ELEMENT_CALDAVTEST:
if ignore_root:
- self.message("trace", "Ignoring file \"{}\" because it is not a test file".format(fname))
+ self.message("trace", "Ignoring file \"{f}\" because it is not a test file".format(f=fname))
return None
else:
raise EX_INVALID_CONFIG_FILE
if not len(caldavtest_node):
raise EX_INVALID_CONFIG_FILE
- self.message("Reading Test Details from \"{}\"".format(fname))
+ self.message("Reading Test Details from \"{f}\"".format(f=fname))
test = caldavtest(self, fname)
test.parseXML(caldavtest_node)
return test
Modified: CalDAVTester/trunk/src/observers/log.py
===================================================================
--- CalDAVTester/trunk/src/observers/log.py 2015-01-27 18:39:08 UTC (rev 14348)
+++ CalDAVTester/trunk/src/observers/log.py 2015-01-28 00:51:37 UTC (rev 14349)
@@ -52,7 +52,7 @@
def start(self):
self.manager.logit("Starting tests")
if self.manager.randomSeed is not None:
- self.manager.logit("Randomizing order using seed '{}'".format(self.manager.randomSeed))
+ self.manager.logit("Randomizing order using seed '{rs}'".format(rs=self.manager.randomSeed))
def testFile(self, result):
@@ -112,16 +112,16 @@
for failed in self.loggedFailures:
self.manager.logit("=" * 70)
self.manager.logit(failed)
- overall = "FAILED (ok={}, ignored={}, failed={}, errors={})".format(
- self.manager.totals[manager.RESULT_OK],
- self.manager.totals[manager.RESULT_IGNORED],
- self.manager.totals[manager.RESULT_FAILED],
- self.manager.totals[manager.RESULT_ERROR],
+ overall = "FAILED (ok={o}, ignored={i}, failed={f}, errors={e})".format(
+ o=self.manager.totals[manager.RESULT_OK],
+ i=self.manager.totals[manager.RESULT_IGNORED],
+ f=self.manager.totals[manager.RESULT_FAILED],
+ e=self.manager.totals[manager.RESULT_ERROR],
)
else:
- overall = "PASSED (ok={}, ignored={})".format(
- self.manager.totals[manager.RESULT_OK],
- self.manager.totals[manager.RESULT_IGNORED],
+ overall = "PASSED (ok={o}, ignored={i})".format(
+ o=self.manager.totals[manager.RESULT_OK],
+ i=self.manager.totals[manager.RESULT_IGNORED],
)
self.manager.logit("-" * 70)
self.manager.logit("Ran {total} tests in {time:.3f}s\n".format(
Modified: CalDAVTester/trunk/src/serverinfo.py
===================================================================
--- CalDAVTester/trunk/src/serverinfo.py 2015-01-27 18:39:08 UTC (rev 14348)
+++ CalDAVTester/trunk/src/serverinfo.py 2015-01-28 00:51:37 UTC (rev 14349)
@@ -149,7 +149,7 @@
def newUIDs(self):
- uidsubs = dict([("$uid{}:".format(i), str(uuid4())) for i in range(1, 21)])
+ uidsubs = dict([("$uid{u}:".format(u=i), str(uuid4())) for i in range(1, 21)])
self.subsdict.update(uidsubs)
self.extrasubsdict.update(uidsubs)
return set([(v, k) for k, v in uidsubs.items()])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150127/adebe6c2/attachment.html>
More information about the calendarserver-changes
mailing list