<!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>[12315] twext/trunk/twext/who/ldap/test/test_service.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/12315">12315</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-11 15:39:39 -0800 (Sat, 11 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start populating the mock directory. Use the test XML directory as a data source.</pre>
<h3>Modified Paths</h3>
<ul>
<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="twexttrunktwextwholdaptesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_service.py (12314 => 12315)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_service.py 2014-01-11 22:17:58 UTC (rev 12314)
+++ twext/trunk/twext/who/ldap/test/test_service.py 2014-01-11 23:39:39 UTC (rev 12315)
</span><span class="lines">@@ -14,6 +14,8 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+from __future__ import print_function
+
</ins><span class="cx"> """
</span><span class="cx"> LDAP directory service tests.
</span><span class="cx"> """
</span><span class="lines">@@ -21,6 +23,7 @@
</span><span class="cx"> import ldap
</span><span class="cx"> from mockldap import MockLdap
</span><span class="cx">
</span><ins>+from twisted.python.constants import NamedConstant, ValueConstant
</ins><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.cred.credentials import UsernamePassword
</span><span class="lines">@@ -35,11 +38,10 @@
</span><span class="cx"> DirectoryService, DirectoryRecord,
</span><span class="cx"> )
</span><span class="cx">
</span><del>-
</del><span class="cx"> from ...test import test_directory
</span><ins>+from ...test.test_xml import xmlService
</ins><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class BaseTestCase(object):
</span><span class="cx"> """
</span><span class="cx"> Tests for L{DirectoryService}.
</span><span class="lines">@@ -50,14 +52,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def setUp(self):
</span><del>- # super(BaseTestCase, self).setUp()
- self.mockLDAP = MockLdap(mockDirectoryData)
</del><ins>+ self.mockLDAP = MockLdap(mockDirectoryDataFromXML(self.mktemp()))
</ins><span class="cx"> self.mockLDAP.start()
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def tearDown(self):
</span><span class="cx"> self.mockLDAP.stop()
</span><del>- # super(BaseTestCase, self).tearDown()
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> def service(self, **kwargs):
</span><span class="lines">@@ -122,6 +122,21 @@
</span><span class="cx"> self.assertFailure(service._connect(), LDAPBindAuthError)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_connect_withUsernamePassword_valid(self):
+ """
+ Connect with UsernamePassword credentials.
+ """
+ credentials = UsernamePassword(
+ "cn=wsanchez,ou=calendarserver,o=org",
+ "__password__"
+ )
+ service = self.service(credentials=credentials)
+
+ raise NotImplementedError(service)
+
+ test_connect_withUsernamePassword_valid.todo = "unimplemented"
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_connect_withOptions(self):
</span><span class="cx"> """
</span><span class="lines">@@ -173,5 +188,44 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-mockDirectoryData = dict(
-)
</del><ins>+def mockDirectoryDataFromXML(tmp):
+ service = xmlService(tmp)
+
+ o = u"org"
+ ou = u"calendarserver"
+
+ data = {
+ u"o={0}".format(o): dict(o=o),
+ u"ou={0}".format(ou): dict(ou=ou),
+ }
+
+ for records in service.index[service.fieldName.uid].itervalues():
+ for record in records:
+ cn = record.shortNames[0]
+
+ key = u"cn={0},ou={1},o={2}".format(cn, ou, o)
+
+ def toUnicode(obj):
+ if isinstance(obj, (NamedConstant, ValueConstant)):
+ return obj.name
+
+ if isinstance(obj, (tuple, list)):
+ return [unicode(x) for x in obj]
+
+ return unicode(obj)
+
+ recordData = dict(
+ (fieldName.name, toUnicode(record.fields[fieldName]))
+ for fieldName in service.fieldName.iterconstants()
+ if fieldName in record.fields
+ )
+
+ data[key] = recordData
+
+ # from pprint import pprint
+ # print("")
+ # print("-" * 80)
+ # pprint(data)
+ # print("-" * 80)
+
+ return data
</ins></span></pre>
</div>
</div>
</body>
</html>