<!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>[13606] CalendarServer/trunk/txdav</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/13606">13606</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-06-04 11:51:13 -0700 (Wed, 04 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix GroupsCommand</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcommondatastoretestaccountsaccountsxml">CalendarServer/trunk/txdav/common/datastore/test/accounts/accounts.xml</a></li>
<li><a href="#CalendarServertrunktxdavdpscommandspy">CalendarServer/trunk/txdav/dps/commands.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsserverpy">CalendarServer/trunk/txdav/dps/server.py</a></li>
<li><a href="#CalendarServertrunktxdavdpstesttest_clientpy">CalendarServer/trunk/txdav/dps/test/test_client.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcommondatastoretestaccountsaccountsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/accounts/accounts.xml (13605 => 13606)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/accounts/accounts.xml 2014-06-04 04:28:02 UTC (rev 13605)
+++ CalendarServer/trunk/txdav/common/datastore/test/accounts/accounts.xml 2014-06-04 18:51:13 UTC (rev 13606)
</span><span class="lines">@@ -387,6 +387,12 @@
</span><span class="cx"> <member-uid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</member-uid>
</span><span class="cx"> </record>
</span><span class="cx">
</span><ins>+ <record type="group">
+ <uid>emptygroup</uid>
+ <short-name>emptygroup</short-name>
+ <full-name>Empty Group</full-name>
+ </record>
+
</ins><span class="cx"> <!-- Calverify test records -->
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpscommandspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/commands.py (13605 => 13606)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/commands.py 2014-06-04 04:28:02 UTC (rev 13605)
+++ CalendarServer/trunk/txdav/dps/commands.py 2014-06-04 18:51:13 UTC (rev 13606)
</span><span class="lines">@@ -144,6 +144,7 @@
</span><span class="cx"> ]
</span><span class="cx"> response = [
</span><span class="cx"> ('fieldsList', amp.ListOf(amp.String())),
</span><ins>+ ('continuation', amp.String(optional=True)),
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/server.py (13605 => 13606)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/server.py 2014-06-04 04:28:02 UTC (rev 13605)
+++ CalendarServer/trunk/txdav/dps/server.py 2014-06-04 18:51:13 UTC (rev 13606)
</span><span class="lines">@@ -362,12 +362,10 @@
</span><span class="cx"> log.error("Failed in groups", error=e)
</span><span class="cx"> record = None
</span><span class="cx">
</span><del>- fieldsList = []
</del><ins>+ records = []
</ins><span class="cx"> for group in (yield record.groups()):
</span><del>- fieldsList.append(self.recordToDict(group))
- response = {
- "fieldsList": pickle.dumps(fieldsList),
- }
</del><ins>+ records.append(group)
+ response = self._recordsToResponse(records)
</ins><span class="cx"> log.debug("Responding with: {response}", response=response)
</span><span class="cx"> returnValue(response)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpstesttest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/test/test_client.py (13605 => 13606)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/test/test_client.py 2014-06-04 04:28:02 UTC (rev 13605)
+++ CalendarServer/trunk/txdav/dps/test/test_client.py 2014-06-04 18:51:13 UTC (rev 13606)
</span><span class="lines">@@ -27,14 +27,15 @@
</span><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="cx"> from twisted.test.testutils import returnConnected
</span><span class="cx"> from twisted.trial import unittest
</span><ins>+from twistedcaldav.config import config
+from twistedcaldav.test.util import StoreTestCase
</ins><span class="cx"> from txdav.dps.client import DirectoryService
</span><span class="cx"> from txdav.dps.server import DirectoryProxyAMPProtocol
</span><span class="cx"> from txdav.who.directory import CalendarDirectoryServiceMixin
</span><ins>+from txdav.who.groups import GroupCacher
</ins><span class="cx"> from txdav.who.test.support import (
</span><span class="cx"> TestRecord, CalendarInMemoryDirectoryService
</span><span class="cx"> )
</span><del>-from twistedcaldav.test.util import StoreTestCase
-from twistedcaldav.config import config
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> testMode = "xml" # "xml" or "od"
</span><span class="lines">@@ -247,6 +248,22 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_members(self):
+ group = yield self.directory.recordWithUID(u"__calendar-dev__")
+ members = yield group.members()
+ self.assertEquals(len(members), 5)
+
+
+ @inlineCallbacks
+ def test_groups(self):
+ # No need to use group cacher as the XML service directly supports
+ # groups()
+ record = yield self.directory.recordWithUID(u"__sagen__")
+ groups = yield record.groups()
+ self.assertEquals(len(groups), 1)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_verifyPlaintextPassword(self):
</span><span class="cx"> expectations = (
</span><span class="cx"> (testPassword, True), # Correct
</span><span class="lines">@@ -540,6 +557,35 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_members(self):
+ group = yield self.client.recordWithUID(u"__top_group_1__")
+ members = yield group.members()
+ self.assertEquals(len(members), 3)
+
+ group = yield self.client.recordWithUID(u"emptygroup")
+ members = yield group.members()
+ self.assertEquals(len(members), 0)
+
+
+ @inlineCallbacks
+ def test_groups(self):
+
+ # A group must first be "refreshed" into the DB otherwise we won't
+ # consider it for group memberships
+ txn = self.store.newTransaction()
+ groupCacher = GroupCacher(self.directory)
+ yield groupCacher.refreshGroup(txn, u"__sub_group_1__")
+ yield txn.commit()
+
+ # record = yield self.client.recordWithUID(u"__sagen1__")
+ # FIXME: this call hangs during unit tests, but not in a real server:
+ # groups = yield record.groups()
+ # self.assertEquals(len(groups), 1)
+
+ test_groups.todo = "Figure out why this hangs"
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_verifyPlaintextPassword(self):
</span><span class="cx"> expectations = (
</span><span class="cx"> (u"zehcnasw", True), # Correct
</span></span></pre>
</div>
</div>
</body>
</html>