<!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>[12405] twext/trunk/twext/who/ldap</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/12405">12405</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 14:35:37 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pull in mutable tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwholdap_constantspy">twext/trunk/twext/who/ldap/_constants.py</a></li>
<li><a href="#twexttrunktwextwholdap_servicepy">twext/trunk/twext/who/ldap/_service.py</a></li>
<li><a href="#twexttrunktwextwholdaptesttest_servicepy">twext/trunk/twext/who/ldap/test/test_service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwholdap_constantspy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/_constants.py (12404 => 12405)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_constants.py 2014-01-20 22:21:09 UTC (rev 12404)
+++ twext/trunk/twext/who/ldap/_constants.py 2014-01-20 22:35:37 UTC (rev 12405)
</span><span class="lines">@@ -348,6 +348,7 @@
</span><span class="cx"> """
</span><span class="cx"> Attributes needed internally that have no standard name.
</span><span class="cx"> """
</span><ins>+ dn = ValueConstant(u"__dn__")
</ins><span class="cx"> generatedUUID = ValueConstant(u"entryUUID")
</span><span class="cx"> objectClass = ValueConstant(u"objectClass")
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwholdap_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/_service.py (12404 => 12405)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_service.py 2014-01-20 22:21:09 UTC (rev 12404)
+++ twext/trunk/twext/who/ldap/_service.py 2014-01-20 22:35:37 UTC (rev 12405)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> import ldap
</span><span class="cx">
</span><ins>+from twisted.python.constants import Names, NamedConstant
</ins><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span><span class="cx"> from twisted.internet.threads import deferToThread
</span><span class="cx"> from twisted.cred.credentials import IUsernamePassword
</span><span class="lines">@@ -89,13 +90,25 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class LDAPQueryError(LDAPError):
</span><span class="cx"> """
</span><span class="cx"> LDAP query error.
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> #
</span><ins>+# Data type extentions
+#
+
+class FieldName(Names):
+ dn = NamedConstant()
+ dn.description = u"distinguished name"
+
+
+
+#
</ins><span class="cx"> # LDAP schema descriptions
</span><span class="cx"> #
</span><span class="cx">
</span><span class="lines">@@ -126,6 +139,7 @@
</span><span class="cx">
</span><span class="cx"> # Maps field name -> LDAP attribute names
</span><span class="cx"> DEFAULT_FIELDNAME_ATTRIBUTE_MAP = MappingProxyType({
</span><ins>+ FieldName.dn: (LDAPAttribute.dn.value,),
</ins><span class="cx"> BaseFieldName.guid: (LDAPAttribute.generatedUUID.value,),
</span><span class="cx"> BaseFieldName.shortNames: (LDAPAttribute.uid.value,),
</span><span class="cx"> BaseFieldName.fullNames: (LDAPAttribute.cn.value,),
</span><span class="lines">@@ -177,6 +191,8 @@
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><ins>+ fieldName = ConstantsContainer((BaseFieldName, FieldName))
+
</ins><span class="cx"> recordType = ConstantsContainer((
</span><span class="cx"> BaseRecordType.user, BaseRecordType.group,
</span><span class="cx"> ))
</span><span class="lines">@@ -418,6 +434,7 @@
</span><span class="cx">
</span><span class="cx"> fields[self.fieldName.recordType] = recordType
</span><span class="cx"> fields[self.fieldName.uid] = uid
</span><ins>+ fields[self.fieldName.dn] = dn
</ins><span class="cx">
</span><span class="cx"> # Make a record object from fields.
</span><span class="cx">
</span><span class="lines">@@ -453,7 +470,19 @@
</span><span class="cx"> return self._recordsFromQueryString(queryString)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ # def updateRecords(self, records, create=False):
+ # for record in records:
+ # return fail(NotAllowedError("Record updates not allowed."))
+ # return succeed(None)
</ins><span class="cx">
</span><ins>+
+ # def removeRecords(self, uids):
+ # for uid in uids:
+ # return fail(NotAllowedError("Record removal not allowed."))
+ # return succeed(None)
+
+
+
</ins><span class="cx"> class DirectoryRecord(BaseDirectoryRecord):
</span><span class="cx"> """
</span><span class="cx"> LDAP directory record.
</span></span></pre></div>
<a id="twexttrunktwextwholdaptesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_service.py (12404 => 12405)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_service.py 2014-01-20 22:21:09 UTC (rev 12404)
+++ twext/trunk/twext/who/ldap/test/test_service.py 2014-01-20 22:35:37 UTC (rev 12405)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> as BaseDirectoryServiceConvenienceTestMixIn,
</span><span class="cx"> DirectoryServiceRealmTestMixIn,
</span><span class="cx"> DirectoryServiceQueryTestMixIn as BaseDirectoryServiceQueryTestMixIn,
</span><ins>+ DirectoryServiceMutableTestMixIn as BaseDirectoryServiceMutableTestMixIn,
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -129,19 +130,16 @@
</span><span class="cx"> class DirectoryServiceQueryTestMixIn(BaseDirectoryServiceQueryTestMixIn):
</span><span class="cx"> def test_queryNot(self):
</span><span class="cx"> return BaseDirectoryServiceQueryTestMixIn.test_queryNot(self)
</span><del>-
</del><span class="cx"> test_queryNot.todo = "?"
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_queryNotNoIndex(self):
</span><span class="cx"> return BaseDirectoryServiceQueryTestMixIn.test_queryNotNoIndex(self)
</span><del>-
</del><span class="cx"> test_queryNotNoIndex.todo = "?"
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_queryStartsWithNot(self):
</span><span class="cx"> return BaseDirectoryServiceQueryTestMixIn.test_queryStartsWithNot(self)
</span><del>-
</del><span class="cx"> test_queryStartsWithNot.todo = "?"
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -150,7 +148,6 @@
</span><span class="cx"> BaseDirectoryServiceQueryTestMixIn
</span><span class="cx"> .test_queryStartsWithNotAny(self)
</span><span class="cx"> )
</span><del>-
</del><span class="cx"> test_queryStartsWithNotAny.todo = "?"
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -159,13 +156,11 @@
</span><span class="cx"> BaseDirectoryServiceQueryTestMixIn
</span><span class="cx"> .test_queryStartsWithNotNoIndex(self)
</span><span class="cx"> )
</span><del>-
</del><span class="cx"> test_queryStartsWithNotNoIndex.todo = "?"
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_queryContainsNot(self):
</span><span class="cx"> return BaseDirectoryServiceQueryTestMixIn.test_queryContainsNot(self)
</span><del>-
</del><span class="cx"> test_queryContainsNot.todo = "?"
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -174,11 +169,42 @@
</span><span class="cx"> BaseDirectoryServiceQueryTestMixIn
</span><span class="cx"> .test_queryContainsNotNoIndex(self)
</span><span class="cx"> )
</span><del>-
</del><span class="cx"> test_queryContainsNotNoIndex.todo = "?"
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class DirectoryServiceMutableTestMixIn(BaseDirectoryServiceMutableTestMixIn):
+ def test_removeRecord(self):
+ return BaseDirectoryServiceMutableTestMixIn.test_removeRecord(self)
+ test_removeRecord.todo = "?"
+
+
+ def test_removeRecordNoExist(self):
+ return (
+ BaseDirectoryServiceMutableTestMixIn.test_removeRecordNoExist(self)
+ )
+ test_removeRecordNoExist.todo = "?"
+
+
+ def test_addRecord(self):
+ return BaseDirectoryServiceMutableTestMixIn.test_addRecord(self)
+ test_addRecord.todo = "?"
+
+
+ def test_updateRecord(self):
+ return BaseDirectoryServiceMutableTestMixIn.test_updateRecord(self)
+ test_updateRecord.todo = "?"
+
+
+ def test_addRecordNoCreate(self):
+ raise NotImplementedError()
+ return (
+ BaseDirectoryServiceMutableTestMixIn.test_addRecordNoCreate(self)
+ )
+ test_addRecordNoCreate.todo = "?"
+
+
+
</ins><span class="cx"> class DirectoryServiceConnectionTestMixIn(object):
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_connect_defaults(self):
</span><span class="lines">@@ -287,6 +313,7 @@
</span><span class="cx"> DirectoryServiceConvenienceTestMixIn,
</span><span class="cx"> DirectoryServiceRealmTestMixIn,
</span><span class="cx"> DirectoryServiceQueryTestMixIn,
</span><ins>+ DirectoryServiceMutableTestMixIn,
</ins><span class="cx"> DirectoryServiceConnectionTestMixIn,
</span><span class="cx"> test_directory.BaseDirectoryServiceTest,
</span><span class="cx"> unittest.TestCase,
</span></span></pre>
</div>
</div>
</body>
</html>