<!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>[12645] CalendarServer/trunk/txweb2/test/test_stream.py</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/12645">12645</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 07:28:05 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove outdated module reference.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxweb2testtest_streampy">CalendarServer/trunk/txweb2/test/test_stream.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxweb2testtest_streampy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_stream.py (12644 => 12645)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txweb2/test/test_stream.py 2014-02-11 14:56:20 UTC (rev 12644)
+++ CalendarServer/trunk/txweb2/test/test_stream.py 2014-02-11 15:28:05 UTC (rev 12645)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> def test_split(self):
</span><span class="cx"> for point in range(10):
</span><span class="cx"> s = self.makeStream(0)
</span><del>- a,b = s.split(point)
</del><ins>+ a, b = s.split(point)
</ins><span class="cx"> if point > 0:
</span><span class="cx"> self.assertEquals(bufstr(a.read()), self.text[:point])
</span><span class="cx"> self.assertEquals(a.read(), None)
</span><span class="lines">@@ -40,12 +40,12 @@
</span><span class="cx"> for point in range(7):
</span><span class="cx"> s = self.makeStream(2, 6)
</span><span class="cx"> self.assertEquals(s.length, 6)
</span><del>- a,b = s.split(point)
</del><ins>+ a, b = s.split(point)
</ins><span class="cx"> if point > 0:
</span><del>- self.assertEquals(bufstr(a.read()), self.text[2:point+2])
</del><ins>+ self.assertEquals(bufstr(a.read()), self.text[2:point + 2])
</ins><span class="cx"> self.assertEquals(a.read(), None)
</span><span class="cx"> if point < 6:
</span><del>- self.assertEquals(bufstr(b.read()), self.text[point+2:8])
</del><ins>+ self.assertEquals(bufstr(b.read()), self.text[point + 2:8])
</ins><span class="cx"> self.assertEquals(b.read(), None)
</span><span class="cx">
</span><span class="cx"> def test_read(self):
</span><span class="lines">@@ -127,8 +127,8 @@
</span><span class="cx">
</span><span class="cx"> def test_mmapwrapper(self):
</span><span class="cx"> self.assertRaises(TypeError, stream.mmapwrapper)
</span><del>- self.assertRaises(TypeError, stream.mmapwrapper, offset = 0)
- self.assertRaises(TypeError, stream.mmapwrapper, offset = None)
</del><ins>+ self.assertRaises(TypeError, stream.mmapwrapper, offset=0)
+ self.assertRaises(TypeError, stream.mmapwrapper, offset=None)
</ins><span class="cx">
</span><span class="cx"> if not stream.mmap:
</span><span class="cx"> test_mmapwrapper.skip = 'mmap not supported here'
</span><span class="lines">@@ -185,19 +185,19 @@
</span><span class="cx">
</span><span class="cx"> def test_readlineWithSize(self):
</span><span class="cx"> """Test the size argument to readline"""
</span><del>- d = self.s.readline(size = 5)
</del><ins>+ d = self.s.readline(size=5)
</ins><span class="cx"> d.addCallback(self._cbGotData, 'I was')
</span><span class="cx"> return d
</span><span class="cx">
</span><span class="cx"> def test_readlineWithBigSize(self):
</span><span class="cx"> """Test the size argument when it's bigger than the length of the line."""
</span><del>- d = self.s.readline(size = 40)
</del><ins>+ d = self.s.readline(size=40)
</ins><span class="cx"> d.addCallback(self._cbGotData, 'I was angry with my friend:\r\n')
</span><span class="cx"> return d
</span><span class="cx">
</span><span class="cx"> def test_readlineWithZero(self):
</span><span class="cx"> """Test readline with size = 0."""
</span><del>- d = self.s.readline(size = 0)
</del><ins>+ d = self.s.readline(size=0)
</ins><span class="cx"> d.addCallback(self._cbGotData, '')
</span><span class="cx"> return d
</span><span class="cx">
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">
</span><span class="cx"> def test_readlineNegSize(self):
</span><span class="cx"> """Ensure that readline with a negative size raises an exception."""
</span><del>- self.assertRaises(ValueError, self.s.readline, size = -1)
</del><ins>+ self.assertRaises(ValueError, self.s.readline, size=-1)
</ins><span class="cx">
</span><span class="cx"> def test_readlineSizeInDelimiter(self):
</span><span class="cx"> """
</span><span class="lines">@@ -260,26 +260,26 @@
</span><span class="cx">
</span><span class="cx"> length = None
</span><span class="cx">
</span><del>- readCalled=0
- closeCalled=0
</del><ins>+ readCalled = 0
+ closeCalled = 0
</ins><span class="cx">
</span><span class="cx"> def __init__(self, list):
</span><span class="cx"> self.list = list
</span><span class="cx">
</span><span class="cx"> def read(self):
</span><del>- self.readCalled+=1
</del><ins>+ self.readCalled += 1
</ins><span class="cx"> if self.list:
</span><span class="cx"> return self.list.pop(0)
</span><span class="cx"> return None
</span><span class="cx">
</span><span class="cx"> def close(self):
</span><del>- self.closeCalled+=1
</del><ins>+ self.closeCalled += 1
</ins><span class="cx"> self.list = []
</span><span class="cx">
</span><span class="cx"> class FallbackSplitTest(unittest.TestCase):
</span><span class="cx"> def test_split(self):
</span><span class="cx"> s = TestStreamer(['abcd', defer.succeed('efgh'), 'ijkl'])
</span><del>- left,right = stream.fallbackSplit(s, 5)
</del><ins>+ left, right = stream.fallbackSplit(s, 5)
</ins><span class="cx"> self.assertEquals(left.length, 5)
</span><span class="cx"> self.assertEquals(right.length, None)
</span><span class="cx"> self.assertEquals(bufstr(left.read()), 'abcd')
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx">
</span><span class="cx"> def test_split2(self):
</span><span class="cx"> s = TestStreamer(['abcd', defer.succeed('efgh'), 'ijkl'])
</span><del>- left,right = stream.fallbackSplit(s, 4)
</del><ins>+ left, right = stream.fallbackSplit(s, 4)
</ins><span class="cx">
</span><span class="cx"> self.assertEquals(left.length, 4)
</span><span class="cx"> self.assertEquals(right.length, None)
</span><span class="lines">@@ -311,8 +311,8 @@
</span><span class="cx">
</span><span class="cx"> def test_splitsplit(self):
</span><span class="cx"> s = TestStreamer(['abcd', defer.succeed('efgh'), 'ijkl'])
</span><del>- left,right = stream.fallbackSplit(s, 5)
- left,middle = left.split(3)
</del><ins>+ left, right = stream.fallbackSplit(s, 5)
+ left, middle = left.split(3)
</ins><span class="cx">
</span><span class="cx"> self.assertEquals(left.length, 3)
</span><span class="cx"> self.assertEquals(middle.length, 2)
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx">
</span><span class="cx"> def test_closeboth(self):
</span><span class="cx"> s = TestStreamer(['abcd', defer.succeed('efgh'), 'ijkl'])
</span><del>- left,right = stream.fallbackSplit(s, 5)
</del><ins>+ left, right = stream.fallbackSplit(s, 5)
</ins><span class="cx"> left.close()
</span><span class="cx"> self.assertEquals(s.closeCalled, 0)
</span><span class="cx"> right.close()
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">
</span><span class="cx"> def test_closeboth_rev(self):
</span><span class="cx"> s = TestStreamer(['abcd', defer.succeed('efgh'), 'ijkl'])
</span><del>- left,right = stream.fallbackSplit(s, 5)
</del><ins>+ left, right = stream.fallbackSplit(s, 5)
</ins><span class="cx"> right.close()
</span><span class="cx"> self.assertEquals(s.closeCalled, 0)
</span><span class="cx"> left.close()
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx">
</span><span class="cx"> def test_closeleft(self):
</span><span class="cx"> s = TestStreamer(['abcd', defer.succeed('efgh'), 'ijkl'])
</span><del>- left,right = stream.fallbackSplit(s, 5)
</del><ins>+ left, right = stream.fallbackSplit(s, 5)
</ins><span class="cx"> left.close()
</span><span class="cx"> d = right.read()
</span><span class="cx"> d.addCallback(self._cbCloseleft, right)
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx">
</span><span class="cx"> def test_closeright(self):
</span><span class="cx"> s = TestStreamer(['abcd', defer.succeed('efgh'), 'ijkl'])
</span><del>- left,right = stream.fallbackSplit(s, 3)
</del><ins>+ left, right = stream.fallbackSplit(s, 3)
</ins><span class="cx"> right.close()
</span><span class="cx">
</span><span class="cx"> self.assertEquals(bufstr(left.read()), 'abc')
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx">
</span><span class="cx"> def test_processingException(self):
</span><span class="cx"> s = TestStreamer(['abcd', defer.succeed('efgh'), 'ijkl'])
</span><del>- return stream.readStream(s, lambda x: 1/0).addErrback(
</del><ins>+ return stream.readStream(s, lambda x: 1 / 0).addErrback(
</ins><span class="cx"> lambda _: _.trap(ZeroDivisionError))
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -676,7 +676,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-__doctests__ = ['txweb2.test.test_stream', 'twext.web2.stream']
</del><ins>+__doctests__ = ['txweb2.test.test_stream']
</ins><span class="cx"> # TODO:
</span><span class="cx"> # CompoundStreamTest
</span><span class="cx"> # more tests for ProducerStreamTest
</span></span></pre>
</div>
</div>
</body>
</html>