<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12674] CalDAVTester/trunk/src</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12674">12674</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 07:30:33 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better failure logging.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunksrccaldavtestpy">CalDAVTester/trunk/src/caldavtest.py</a></li>
<li><a href="#CalDAVTestertrunksrcmanagerpy">CalDAVTester/trunk/src/manager.py</a></li>
<li><a href="#CalDAVTestertrunksrcobserverslogpy">CalDAVTester/trunk/src/observers/log.py</a></li>
<li><a href="#CalDAVTestertrunksrcrequestpy">CalDAVTester/trunk/src/request.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunksrccaldavtestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/caldavtest.py (12673 => 12674)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/caldavtest.py 2014-02-12 08:12:19 UTC (rev 12673)
+++ CalDAVTester/trunk/src/caldavtest.py 2014-02-12 15:30:33 UTC (rev 12674)
</span><span class="lines">@@ -197,6 +197,9 @@
</span><span class="cx"> while t > time.time():
</span><span class="cx"> failed = False
</span><span class="cx"> if getattr(req, "iterate_data", False):
</span><ins>+ if not req.hasNextData():
+ self.manager.testResult(testsuite, test.name, " No iteration data - ignored", manager.RESULT_IGNORED)
+ return "i"
</ins><span class="cx"> while req.getNextData():
</span><span class="cx"> result, resulttxt, _ignore_response, _ignore_respdata = self.dorequest(req, test.details, True, False, reqstats, etags=etags, label="%s | #%s" % (label, req_count + 1,), count=ctr + 1)
</span><span class="cx"> if not result:
</span></span></pre></div>
<a id="CalDAVTestertrunksrcmanagerpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/manager.py (12673 => 12674)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/manager.py 2014-02-12 08:12:19 UTC (rev 12673)
+++ CalDAVTester/trunk/src/manager.py 2014-02-12 15:30:33 UTC (rev 12674)
</span><span class="lines">@@ -93,6 +93,8 @@
</span><span class="cx"> "result": result,
</span><span class="cx"> "tests": []
</span><span class="cx"> })
</span><ins>+ if result is not None:
+ self.totals[result] += 1
</ins><span class="cx"> self.message("testFile", self.results[-1])
</span><span class="cx"> return self.results[-1]["tests"]
</span><span class="cx">
</span><span class="lines">@@ -104,6 +106,8 @@
</span><span class="cx"> "result": result,
</span><span class="cx"> "tests": []
</span><span class="cx"> })
</span><ins>+ if result is not None:
+ self.totals[result] += 1
</ins><span class="cx"> self.message("testSuite", testfile[-1])
</span><span class="cx"> return testfile[-1]["tests"]
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVTestertrunksrcobserverslogpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/observers/log.py (12673 => 12674)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/observers/log.py 2014-02-12 08:12:19 UTC (rev 12673)
+++ CalDAVTester/trunk/src/observers/log.py 2014-02-12 15:30:33 UTC (rev 12674)
</span><span class="lines">@@ -59,12 +59,27 @@
</span><span class="cx"> self.currentFile = result["name"].replace("/", ".")[:-4]
</span><span class="cx"> self.manager.logit("")
</span><span class="cx"> self._logResult(self.currentFile, result)
</span><ins>+ if result["result"] in (manager.RESULT_FAILED, manager.RESULT_ERROR):
+ failtxt = "{result}\n{details}\n\n{file}".format(
+ result=self.RESULT_STRINGS[result["result"]],
+ details=result["details"],
+ file=self.currentFile,
+ )
+ self.loggedFailures.append(failtxt)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def testSuite(self, result):
</span><span class="cx"> self.currentSuite = result["name"]
</span><span class="cx"> result_name = " Suite: " + result["name"]
</span><span class="cx"> self._logResult(result_name, result)
</span><ins>+ if result["result"] in (manager.RESULT_FAILED, manager.RESULT_ERROR):
+ failtxt = "{result}\n{details}\n\n{file}/{suite}".format(
+ result=self.RESULT_STRINGS[result["result"]],
+ details=result["details"],
+ file=self.currentFile,
+ suite=self.currentSuite,
+ )
+ self.loggedFailures.append(failtxt)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def testResult(self, result):
</span></span></pre></div>
<a id="CalDAVTestertrunksrcrequestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/request.py (12673 => 12674)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/request.py 2014-02-12 08:12:19 UTC (rev 12673)
+++ CalDAVTester/trunk/src/request.py 2014-02-12 15:30:33 UTC (rev 12674)
</span><span class="lines">@@ -319,6 +319,11 @@
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def hasNextData(self):
+ dataList = sorted([path for path in os.listdir(self.data.filepath) if not path.startswith(".")])
+ return len(dataList) != 0
+
+
</ins><span class="cx"> def generateCalendarData(self, data):
</span><span class="cx"> """
</span><span class="cx"> FIXME: does not work for events with recurrence overrides.
</span></span></pre>
</div>
</div>
</body>
</html>