<!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>[14543] CalendarServer/trunk/txdav/common/datastore/podding/test/util.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/14543">14543</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-09 17:28:51 -0700 (Mon, 09 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>lint</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcommondatastorepoddingtestutilpy">CalendarServer/trunk/txdav/common/datastore/podding/test/util.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcommondatastorepoddingtestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/podding/test/util.py (14542 => 14543)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/podding/test/util.py 2015-03-10 00:26:26 UTC (rev 14542)
+++ CalendarServer/trunk/txdav/common/datastore/podding/test/util.py 2015-03-10 00:28:51 UTC (rev 14543)
</span><span class="lines">@@ -50,11 +50,12 @@
</span><span class="cx"> @classmethod
</span><span class="cx"> def addServerStore(cls, server, store):
</span><span class="cx"> """
</span><del>- Add a store mapped to a server. These mappings are used to "deliver" conduit
- requests to the appropriate store.
</del><ins>+ Add a store mapped to a server. These mappings are used to "deliver"
+ conduit requests to the appropriate store.
</ins><span class="cx">
</span><span class="cx"> @param uri: the server
</span><span class="cx"> @type uri: L{Server}
</span><ins>+
</ins><span class="cx"> @param store: the store
</span><span class="cx"> @type store: L{ICommonDataStore}
</span><span class="cx"> """
</span><span class="lines">@@ -62,8 +63,9 @@
</span><span class="cx"> cls.storeMap[server.details()] = store
</span><span class="cx">
</span><span class="cx">
</span><del>- def __init__(self, server, data, stream=None, stream_type=None, writeStream=None):
-
</del><ins>+ def __init__(
+ self, server, data, stream=None, stream_type=None, writeStream=None
+ ):
</ins><span class="cx"> self.server = server
</span><span class="cx"> self.data = json.dumps(data)
</span><span class="cx"> self.stream = stream
</span><span class="lines">@@ -88,15 +90,20 @@
</span><span class="cx"> try:
</span><span class="cx"> if store.conduit.isStreamAction(j):
</span><span class="cx"> stream = ProducerStream()
</span><ins>+
</ins><span class="cx"> class StreamProtocol(Protocol):
</span><span class="cx"> def connectionMade(self):
</span><span class="cx"> stream.registerProducer(self.transport, False)
</span><ins>+
</ins><span class="cx"> def dataReceived(self, data):
</span><span class="cx"> stream.write(data)
</span><ins>+
</ins><span class="cx"> def connectionLost(self, reason):
</span><span class="cx"> stream.finish()
</span><span class="cx">
</span><del>- result = yield store.conduit.processRequestStream(j, StreamProtocol())
</del><ins>+ result = yield store.conduit.processRequestStream(
+ j, StreamProtocol()
+ )
</ins><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> ct, name = result
</span><span class="lines">@@ -104,7 +111,9 @@
</span><span class="cx"> code = responsecode.BAD_REQUEST
</span><span class="cx"> else:
</span><span class="cx"> headers = {"content-type": MimeType.fromString(ct)}
</span><del>- headers["content-disposition"] = MimeDisposition("attachment", params={"filename": name})
</del><ins>+ headers["content-disposition"] = MimeDisposition(
+ "attachment", params={"filename": name}
+ )
</ins><span class="cx"> returnValue(Response(responsecode.OK, headers, stream))
</span><span class="cx"> else:
</span><span class="cx"> result = yield store.conduit.processRequest(j)
</span><span class="lines">@@ -113,7 +122,10 @@
</span><span class="cx"> # Send the exception over to the other side
</span><span class="cx"> result = {
</span><span class="cx"> "result": "exception",
</span><del>- "class": ".".join((e.__class__.__module__, e.__class__.__name__,)),
</del><ins>+ "class": ".".join((
+ e.__class__.__module__,
+ e.__class__.__name__,
+ )),
</ins><span class="cx"> "details": str(e),
</span><span class="cx"> }
</span><span class="cx"> code = responsecode.BAD_REQUEST
</span><span class="lines">@@ -136,7 +148,9 @@
</span><span class="cx"> def __init__(self, methodName='runTest'):
</span><span class="cx"> txweb2.dav.test.util.TestCase.__init__(self, methodName)
</span><span class="cx"> while len(self.theStoreBuilders) < self.numberOfStores:
</span><del>- self.theStoreBuilders.append(SQLStoreBuilder(count=len(self.theStoreBuilders)))
</del><ins>+ self.theStoreBuilders.append(
+ SQLStoreBuilder(count=len(self.theStoreBuilders))
+ )
</ins><span class="cx"> self.theStores = [None] * self.numberOfStores
</span><span class="cx"> self.activeTransactions = [None] * self.numberOfStores
</span><span class="cx">
</span><span class="lines">@@ -151,7 +165,9 @@
</span><span class="cx"> for j in range(self.numberOfStores):
</span><span class="cx"> letter = chr(ord("A") + j)
</span><span class="cx"> port = 8008 + 100 * j
</span><del>- server = Server(letter, "http://127.0.0.1:{}".format(port), letter, j == i)
</del><ins>+ server = Server(
+ letter, "http://127.0.0.1:{}".format(port), letter, j == i
+ )
</ins><span class="cx"> serversDB.addServer(server)
</span><span class="cx">
</span><span class="cx"> if i == 0:
</span><span class="lines">@@ -163,7 +179,9 @@
</span><span class="cx"> )
</span><span class="cx"> self.theStores[i] = self.store
</span><span class="cx"> else:
</span><del>- self.theStores[i] = yield self.buildStore(self.theStoreBuilders[i])
</del><ins>+ self.theStores[i] = yield self.buildStore(
+ self.theStoreBuilders[i]
+ )
</ins><span class="cx"> directory = buildTestDirectory(
</span><span class="cx"> self.theStores[i],
</span><span class="cx"> self.mktemp(),
</span><span class="lines">@@ -176,7 +194,9 @@
</span><span class="cx"> self.theStores[i].queryCacher = None # Cannot use query caching
</span><span class="cx"> self.theStores[i].conduit = self.makeConduit(self.theStores[i])
</span><span class="cx">
</span><del>- FakeConduitRequest.addServerStore(serversDB.getServerById(chr(ord("A") + i)), self.theStores[i])
</del><ins>+ FakeConduitRequest.addServerStore(
+ serversDB.getServerById(chr(ord("A") + i)), self.theStores[i]
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def configure(self):
</span><span class="lines">@@ -230,7 +250,9 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def waitAllEmpty(self):
</span><span class="cx"> for i in range(self.numberOfStores):
</span><del>- yield JobItem.waitEmpty(self.theStoreUnderTest(i).newTransaction, reactor, 60.0)
</del><ins>+ yield JobItem.waitEmpty(
+ self.theStoreUnderTest(i).newTransaction, reactor, 60.0
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def makeConduit(self, store):
</span><span class="lines">@@ -240,15 +262,23 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def createShare(self, ownerGUID="user01", shareeGUID="puser02", name="calendar"):
</del><ins>+ def createShare(
+ self, ownerGUID="user01", shareeGUID="puser02", name="calendar"
+ ):
</ins><span class="cx">
</span><del>- home = yield self.homeUnderTest(txn=self.theTransactionUnderTest(0), name=ownerGUID, create=True)
</del><ins>+ home = yield self.homeUnderTest(
+ txn=self.theTransactionUnderTest(0), name=ownerGUID, create=True
+ )
</ins><span class="cx"> calendar = yield home.calendarWithName(name)
</span><del>- yield calendar.inviteUIDToShare(shareeGUID, _BIND_MODE_WRITE, "shared", shareName="shared-calendar")
</del><ins>+ yield calendar.inviteUIDToShare(
+ shareeGUID, _BIND_MODE_WRITE, "shared", shareName="shared-calendar"
+ )
</ins><span class="cx"> yield self.commitTransaction(0)
</span><span class="cx">
</span><span class="cx"> # ACK: home2 is None
</span><del>- home2 = yield self.homeUnderTest(txn=self.theTransactionUnderTest(1), name=shareeGUID)
</del><ins>+ home2 = yield self.homeUnderTest(
+ txn=self.theTransactionUnderTest(1), name=shareeGUID
+ )
</ins><span class="cx"> yield home2.acceptShare("shared-calendar")
</span><span class="cx"> yield self.commitTransaction(1)
</span><span class="cx">
</span><span class="lines">@@ -256,9 +286,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def removeShare(self, ownerGUID="user01", shareeGUID="puser02", name="calendar"):
</del><ins>+ def removeShare(
+ self, ownerGUID="user01", shareeGUID="puser02", name="calendar"
+ ):
</ins><span class="cx">
</span><del>- home = yield self.homeUnderTest(txn=self.theTransactionUnderTest(0), name=ownerGUID)
</del><ins>+ home = yield self.homeUnderTest(
+ txn=self.theTransactionUnderTest(0), name=ownerGUID
+ )
</ins><span class="cx"> calendar = yield home.calendarWithName(name)
</span><span class="cx"> yield calendar.uninviteUIDFromShare(shareeGUID)
</span><span class="cx"> yield self.commitTransaction(0)
</span></span></pre>
</div>
</div>
</body>
</html>