<!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>[12308] 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/12308">12308</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-11 13:18:57 -0800 (Sat, 11 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add test_connect_defaults</pre>

<h3>Modified Paths</h3>
<ul>
<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_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/_service.py (12307 => 12308)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_service.py        2014-01-11 19:55:47 UTC (rev 12307)
+++ twext/trunk/twext/who/ldap/_service.py        2014-01-11 21:18:57 UTC (rev 12308)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> )
</span><span class="cx"> # from ._constants import LDAP_QUOTING_TABLE
</span><span class="cx"> 
</span><ins>+DEFAULT_URL = &quot;ldap://localhost/&quot;
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> #
</span><span class="lines">@@ -113,7 +114,7 @@
</span><span class="cx"> 
</span><span class="cx">     def __init__(
</span><span class="cx">         self,
</span><del>-        url=&quot;ldap://localhost/&quot;,
</del><ins>+        url=DEFAULT_URL,
</ins><span class="cx">         credentials=None,
</span><span class="cx">         timeout=None,
</span><span class="cx">         tlsCACertificateFile=None,
</span></span></pre></div>
<a id="twexttrunktwextwholdaptesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_service.py (12307 => 12308)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_service.py        2014-01-11 19:55:47 UTC (rev 12307)
+++ twext/trunk/twext/who/ldap/test/test_service.py        2014-01-11 21:18:57 UTC (rev 12308)
</span><span class="lines">@@ -18,14 +18,16 @@
</span><span class="cx"> LDAP directory service tests.
</span><span class="cx"> &quot;&quot;&quot;
</span><span class="cx"> 
</span><ins>+import ldap
</ins><span class="cx"> from mockldap import MockLdap
</span><span class="cx"> 
</span><ins>+from twisted.internet.defer import inlineCallbacks
</ins><span class="cx"> from twisted.trial import unittest
</span><span class="cx"> 
</span><span class="cx"> # from ...expression import (
</span><span class="cx"> #     CompoundExpression, Operand, MatchExpression, MatchType, MatchFlags
</span><span class="cx"> # )
</span><del>-from .._service import DirectoryService, DirectoryRecord
</del><ins>+from .._service import DirectoryService, DirectoryRecord, DEFAULT_URL
</ins><span class="cx"> 
</span><span class="cx"> from ...test import test_directory
</span><span class="cx"> 
</span><span class="lines">@@ -36,17 +38,19 @@
</span><span class="cx">     Tests for L{DirectoryService}.
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-    realmName = url = u&quot;ldap://localhost/&quot;
</del><ins>+    url = DEFAULT_URL
+    realmName = unicode(DEFAULT_URL)
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx">     def setUp(self):
</span><del>-        super(BaseTestCase, self).setup()
</del><ins>+        # super(BaseTestCase, self).setUp()
</ins><span class="cx">         self.mockLDAP = MockLdap(mockDirectoryData)
</span><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><ins>+        # super(BaseTestCase, self).tearDown()
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def service(self, subClass=None, xmlData=None):
</span><span class="lines">@@ -70,14 +74,34 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class DirectoryServiceTest(
</span><del>-    unittest.TestCase,
</del><span class="cx">     DirectoryServiceConvenienceTestMixIn,
</span><span class="cx">     test_directory.BaseDirectoryServiceTest,
</span><ins>+    unittest.TestCase,
</ins><span class="cx"> ):
</span><span class="cx">     serviceClass = DirectoryService
</span><span class="cx">     directoryRecordClass = DirectoryRecord
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    @inlineCallbacks
+    def test_connect_defaults(self):
+        &quot;&quot;&quot;
+        Connect with default arguments.
+        &quot;&quot;&quot;
+        service = self.service()
+        connection = yield service._connect()
</ins><span class="cx"> 
</span><ins>+        for option in (
+            ldap.OPT_DEBUG_LEVEL,
+            ldap.OPT_TIMEOUT,
+            ldap.OPT_X_TLS_CACERTFILE,
+            ldap.OPT_X_TLS_CACERTDIR,
+        ):
+            self.assertRaises(
+                KeyError,
+                connection.get_option, option
+            )
+
+
+
</ins><span class="cx"> mockDirectoryData = dict(
</span><span class="cx"> )
</span></span></pre>
</div>
</div>

</body>
</html>