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

<h3>Log Message</h3>
<pre>Test called list</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 (12310 => 12311)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_service.py        2014-01-11 21:31:13 UTC (rev 12310)
+++ twext/trunk/twext/who/ldap/_service.py        2014-01-11 21:56:19 UTC (rev 12311)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">         else:
</span><span class="cx">             self._tlsCACertificateDirectory = tlsCACertificateDirectory.path
</span><span class="cx"> 
</span><del>-        self._useTLS = useTLS,
</del><ins>+        self._useTLS = useTLS
</ins><span class="cx"> 
</span><span class="cx">         if debug:
</span><span class="cx">             self._debug = 255
</span><span class="lines">@@ -176,6 +176,7 @@
</span><span class="cx">                     connection.set_option(option, value)
</span><span class="cx"> 
</span><span class="cx">             if self._useTLS:
</span><ins>+                self.log.info(&quot;Starting TLS for {source.url}&quot;)
</ins><span class="cx">                 yield deferToThread(connection.start_tls_s)
</span><span class="cx"> 
</span><span class="cx">             if self.credentials is not None:
</span><span class="lines">@@ -191,7 +192,7 @@
</span><span class="cx">                             credentials=self.credentials
</span><span class="cx">                         )
</span><span class="cx">                     except ldap.INVALID_CREDENTIALS as e:
</span><del>-                        self.log.info(
</del><ins>+                        self.log.error(
</ins><span class="cx">                             &quot;Unable to bind to LDAP as {credentials.username}&quot;,
</span><span class="cx">                             credentials=self.credentials
</span><span class="cx">                         )
</span></span></pre></div>
<a id="twexttrunktwextwholdaptesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_service.py (12310 => 12311)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_service.py        2014-01-11 21:31:13 UTC (rev 12310)
+++ twext/trunk/twext/who/ldap/test/test_service.py        2014-01-11 21:56:19 UTC (rev 12311)
</span><span class="lines">@@ -91,16 +91,15 @@
</span><span class="cx">         service = self.service()
</span><span class="cx">         connection = yield service._connect()
</span><span class="cx"> 
</span><ins>+        self.assertEquals(connection.methods_called(), [&quot;initialize&quot;])
+
</ins><span class="cx">         for option in (
</span><span class="cx">             ldap.OPT_TIMEOUT,
</span><span class="cx">             ldap.OPT_X_TLS_CACERTFILE,
</span><span class="cx">             ldap.OPT_X_TLS_CACERTDIR,
</span><span class="cx">             ldap.OPT_DEBUG_LEVEL,
</span><span class="cx">         ):
</span><del>-            self.assertRaises(
-                KeyError,
-                connection.get_option, option
-            )
</del><ins>+            self.assertRaises(KeyError, connection.get_option, option)
</ins><span class="cx"> 
</span><span class="cx">         self.assertFalse(connection.tls_enabled)
</span><span class="cx"> 
</span><span class="lines">@@ -119,6 +118,17 @@
</span><span class="cx">         )
</span><span class="cx">         connection = yield service._connect()
</span><span class="cx"> 
</span><ins>+        self.assertEquals(
+            connection.methods_called(),
+            sum(
+                (
+                    [&quot;initialize&quot;],
+                    [&quot;set_option&quot;] * 4,
+                    [&quot;start_tls_s&quot;],
+                ), []
+            )
+        )
+
</ins><span class="cx">         opt = lambda k: connection.get_option(k)
</span><span class="cx"> 
</span><span class="cx">         self.assertEquals(opt(ldap.OPT_TIMEOUT), 18)
</span><span class="lines">@@ -129,6 +139,5 @@
</span><span class="cx">         self.assertTrue(connection.tls_enabled)
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> mockDirectoryData = dict(
</span><span class="cx"> )
</span></span></pre>
</div>
</div>

</body>
</html>