[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [2338]
From: source_changes () macosforge ! org
Date: 2008-04-23 23:46:02
Message-ID: 20080423234602.E124615D2217 () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 2338
http://trac.macosforge.org/projects/calendarserver/changeset/2338
Author: wsanchez@apple.com
Date: 2008-04-23 16:46:01 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Simplify test.
Modified Paths:
--------------
CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py
Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py 2008-04-23 \
23:02:25 UTC (rev 2337)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py 2008-04-23 \
23:46:01 UTC (rev 2338) @@ -19,15 +19,18 @@
import twisted.trial.unittest
class TestLogger (Logger):
- def __init__(self, namespace=None, test_emit=None):
+ def __init__(self, namespace=None):
super(TestLogger, self).__init__(namespace)
- self._test_emit = test_emit
def emit(self, level, message, **kwargs):
- if self._test_emit is not None:
- self._test_emit(level, message, **kwargs)
super(TestLogger, self).emit(level, message, **kwargs)
+ self.emitted = {
+ "level" : level,
+ "message": message,
+ "kwargs" : kwargs,
+ }
+
class LoggingEnabledObject (LoggingMixIn):
pass
@@ -56,20 +59,13 @@
for level in logLevels:
message = "This is a %s message" % (level,)
- def test_emit(emit_level, emit_message, **kwargs):
- emitted["level" ] = emit_level
- emitted["message"] = emit_message
- emitted["junk" ] = kwargs["junk"]
-
- log = TestLogger(test_emit=test_emit)
+ log = TestLogger()
object.logger = log
for method in (getattr(log, level), getattr(object, "log_" + level)):
- emitted = {}
-
method(message, junk=message)
# Ensure that test_emit got called with expected arguments
- self.failUnless(emitted["level" ] == level )
- self.failUnless(emitted["message"] == message)
- self.failUnless(emitted["junk" ] == message)
+ self.failUnless(log.emitted["level"] == level)
+ self.failUnless(log.emitted["message"] == message)
+ self.failUnless(log.emitted["kwargs"]["junk"] == message)
[Attachment #5 (text/html)]
<!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" /><style \
type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: \
6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; \
padding: 6px; } #msg ul { overflow: auto; }
#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>
<title>[2338] CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/
test_log.py</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a \
href="http://trac.macosforge.org/projects/calendarserver/changeset/2338">2338</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2008-04-23 16:46:01 -0700 (Wed, 23 Apr 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserswsanchezloggingtwistedcaldavtesttest_logpy">C \
alendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py</a></li> \
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserswsanchezloggingtwistedcaldavtesttest_logpy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py (2337 \
=> 2338)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py 2008-04-23 \
23:02:25 UTC (rev 2337)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py 2008-04-23 \
23:46:01 UTC (rev 2338) </span><span class="lines">@@ -19,15 +19,18 @@
</span><span class="cx"> import twisted.trial.unittest
</span><span class="cx">
</span><span class="cx"> class TestLogger (Logger):
</span><del>- def __init__(self, namespace=None, test_emit=None):
</del><ins>+ def __init__(self, namespace=None):
</ins><span class="cx"> super(TestLogger, self).__init__(namespace)
</span><del>- self._test_emit = test_emit
</del><span class="cx">
</span><span class="cx"> def emit(self, level, message, **kwargs):
</span><del>- if self._test_emit is not None:
- self._test_emit(level, message, **kwargs)
</del><span class="cx"> super(TestLogger, self).emit(level, message, \
**kwargs) </span><span class="cx">
</span><ins>+ self.emitted = {
+ "level" : level,
+ "message": message,
+ "kwargs" : kwargs,
+ }
+
</ins><span class="cx"> class LoggingEnabledObject (LoggingMixIn):
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="lines">@@ -56,20 +59,13 @@
</span><span class="cx"> for level in logLevels:
</span><span class="cx"> message = "This is a %s message" % \
(level,) </span><span class="cx">
</span><del>- def test_emit(emit_level, emit_message, **kwargs):
- emitted["level" ] = emit_level
- emitted["message"] = emit_message
- emitted["junk" ] = kwargs["junk"]
-
- log = TestLogger(test_emit=test_emit)
</del><ins>+ log = TestLogger()
</ins><span class="cx"> object.logger = log
</span><span class="cx">
</span><span class="cx"> for method in (getattr(log, level), \
getattr(object, "log_" + level)): </span><del>- emitted = {}
-
</del><span class="cx"> method(message, junk=message)
</span><span class="cx">
</span><span class="cx"> # Ensure that test_emit got called with \
expected arguments </span><del>- \
self.failUnless(emitted["level" ] == level )
- self.failUnless(emitted["message"] == message)
- self.failUnless(emitted["junk" ] == message)
</del><ins>+ self.failUnless(log.emitted["level"] == level)
+ self.failUnless(log.emitted["message"] == message)
+ self.failUnless(log.emitted["kwargs"]["junk"] == \
message) </ins></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic