<!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>[12649] 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/12649">12649</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 09:16:05 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweaks to logging output.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunksrcmanagerpy">CalDAVTester/trunk/src/manager.py</a></li>
<li><a href="#CalDAVTestertrunksrcobserverslogpy">CalDAVTester/trunk/src/observers/log.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunksrcobserversloadfilespy">CalDAVTester/trunk/src/observers/loadfiles.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunksrcmanagerpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/manager.py (12648 => 12649)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/manager.py 2014-02-11 17:13:48 UTC (rev 12648)
+++ CalDAVTester/trunk/src/manager.py 2014-02-11 17:16:05 UTC (rev 12649)
</span><span class="lines">@@ -158,7 +158,8 @@
</span><span class="cx"> self.server_info.addsubs(moresubs)
</span><span class="cx">
</span><span class="cx"> for ctr, testfile in enumerate(testfiles):
</span><del>- print "\rTest File {} of {}".format(ctr + 1, len(testfiles)),
</del><ins>+ self.message("load", testfile, ctr + 1, len(testfiles))
+
</ins><span class="cx"> # Open and parse the config file
</span><span class="cx"> try:
</span><span class="cx"> tree = ElementTree(file=testfile)
</span><span class="lines">@@ -183,7 +184,7 @@
</span><span class="cx"> if not all or not test.ignore_all:
</span><span class="cx"> self.tests.append(test)
</span><span class="cx">
</span><del>- print ""
</del><ins>+ self.message("load", None, ctr + 1, len(testfiles))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def readCommandLine(self):
</span><span class="lines">@@ -287,7 +288,7 @@
</span><span class="cx"> self.randomSeed = random_seed
</span><span class="cx">
</span><span class="cx"> # Load observers
</span><del>- map(lambda name: self.loadObserver(name), observer_names if observer_names else ["log", ])
</del><ins>+ map(lambda name: self.loadObserver(name), observer_names if observer_names else ["loadfiles", "log", ])
</ins><span class="cx">
</span><span class="cx"> self.readXML(sname, fnames, ssl, all)
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVTestertrunksrcobserversloadfilespy"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/src/observers/loadfiles.py (0 => 12649)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/observers/loadfiles.py (rev 0)
+++ CalDAVTester/trunk/src/observers/loadfiles.py 2014-02-11 17:16:05 UTC (rev 12649)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+##
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from src.observers.base import BaseResultsObserver
+
+class Observer(BaseResultsObserver):
+ """
+ A results observer that prints when a test file is loaded.
+ """
+
+ def updateCalls(self):
+ super(Observer, self).updateCalls()
+ self._calls.update({
+ "load": self.load,
+ })
+
+
+ def load(self, name, current, total):
+ """
+ Message triggered when loading a script file.
+
+ @param name: name of file being loaded, or L{None} for last file
+ @type name: L{str}
+ @param current: current number of files loaded
+ @type current: L{int}
+ @param total: total number of files to load
+ @type total: L{int}
+ """
+
+ if name is not None:
+ self.manager.logit("Loading {current} of {total}: {name}".format(current=current, total=total, name=name))
+ else:
+ self.manager.logit("Loading files complete.\n")
</ins></span></pre></div>
<a id="CalDAVTestertrunksrcobserverslogpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/observers/log.py (12648 => 12649)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/observers/log.py 2014-02-11 17:13:48 UTC (rev 12648)
+++ CalDAVTester/trunk/src/observers/log.py 2014-02-11 17:16:05 UTC (rev 12649)
</span><span class="lines">@@ -71,7 +71,13 @@
</span><span class="cx"> result_name = " Test: " + result["name"]
</span><span class="cx"> self._logResult(result_name, result)
</span><span class="cx"> if result["result"] in (manager.RESULT_FAILED, manager.RESULT_ERROR):
</span><del>- failtxt = "{}/{}/{}\n{}".format(self.currentFile, self.currentSuite, result["name"], result["details"])
</del><ins>+ failtxt = "{result}\n{details}\n\n{file}/{suite}/{test}".format(
+ result=self.RESULT_STRINGS[result["result"]],
+ details=result["details"],
+ file=self.currentFile,
+ suite=self.currentSuite,
+ test=result["name"],
+ )
</ins><span class="cx"> self.loggedFailures.append(failtxt)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -89,19 +95,23 @@
</span><span class="cx"> self.manager.logit("")
</span><span class="cx"> if self.manager.totals[manager.RESULT_FAILED] + self.manager.totals[manager.RESULT_ERROR] != 0:
</span><span class="cx"> for failed in self.loggedFailures:
</span><del>- self.manager.logit("******")
</del><ins>+ self.manager.logit("=" * 70)
</ins><span class="cx"> self.manager.logit(failed)
</span><del>- overall = "******\n\nFAILED (ok={}, ignored={}, failed={}, errors={}) Time = {:.3f} secs".format(
</del><ins>+ overall = "FAILED (ok={}, ignored={}, failed={}, errors={})".format(
</ins><span class="cx"> self.manager.totals[manager.RESULT_OK],
</span><span class="cx"> self.manager.totals[manager.RESULT_IGNORED],
</span><span class="cx"> self.manager.totals[manager.RESULT_FAILED],
</span><span class="cx"> self.manager.totals[manager.RESULT_ERROR],
</span><del>- self.manager.timeDiff
</del><span class="cx"> )
</span><span class="cx"> else:
</span><del>- overall = "PASSED (ok={}, ignored={}) Time = {:.3f} secs".format(
</del><ins>+ overall = "PASSED (ok={}, ignored={})".format(
</ins><span class="cx"> self.manager.totals[manager.RESULT_OK],
</span><span class="cx"> self.manager.totals[manager.RESULT_IGNORED],
</span><del>- self.manager.timeDiff
</del><span class="cx"> )
</span><ins>+ self.manager.logit("-" * 70)
+ self.manager.logit("Ran {total} tests in {time:.3f}s\n".format(
+ total=sum(self.manager.totals.values()),
+ time=self.manager.timeDiff,
+ ))
+
</ins><span class="cx"> self.manager.logit(overall)
</span></span></pre>
</div>
</div>
</body>
</html>