[CalendarServer-changes] [12308] twext/trunk/twext/who/ldap

[source_changes at macosforge.org]

Revision: 12308
          http://trac.calendarserver.org//changeset/12308
Author:   wsanchez at apple.com
Date:     2014-01-11 13:18:57 -0800 (Sat, 11 Jan 2014)
Log Message:
-----------
Add test_connect_defaults

Modified Paths:
--------------
    twext/trunk/twext/who/ldap/_service.py
    twext/trunk/twext/who/ldap/test/test_service.py

Modified: twext/trunk/twext/who/ldap/_service.py
===================================================================
--- 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)
@@ -53,6 +53,7 @@
 )
 # from ._constants import LDAP_QUOTING_TABLE
 
+DEFAULT_URL = "ldap://localhost/"
 
 
 #
@@ -113,7 +114,7 @@
 
     def __init__(
         self,
-        url="ldap://localhost/",
+        url=DEFAULT_URL,
         credentials=None,
         timeout=None,
         tlsCACertificateFile=None,

Modified: twext/trunk/twext/who/ldap/test/test_service.py
===================================================================
--- 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)
@@ -18,14 +18,16 @@
 LDAP directory service tests.
 """
 
+import ldap
 from mockldap import MockLdap
 
+from twisted.internet.defer import inlineCallbacks
 from twisted.trial import unittest
 
 # from ...expression import (
 #     CompoundExpression, Operand, MatchExpression, MatchType, MatchFlags
 # )
-from .._service import DirectoryService, DirectoryRecord
+from .._service import DirectoryService, DirectoryRecord, DEFAULT_URL
 
 from ...test import test_directory
 
@@ -36,17 +38,19 @@
     Tests for L{DirectoryService}.
     """
 
-    realmName = url = u"ldap://localhost/"
+    url = DEFAULT_URL
+    realmName = unicode(DEFAULT_URL)
 
+
     def setUp(self):
-        super(BaseTestCase, self).setup()
+        # super(BaseTestCase, self).setUp()
         self.mockLDAP = MockLdap(mockDirectoryData)
         self.mockLDAP.start()
 
 
     def tearDown(self):
         self.mockLDAP.stop()
-        super(BaseTestCase, self).tearDown()
+        # super(BaseTestCase, self).tearDown()
 
 
     def service(self, subClass=None, xmlData=None):
@@ -70,14 +74,34 @@
 
 
 class DirectoryServiceTest(
-    unittest.TestCase,
     DirectoryServiceConvenienceTestMixIn,
     test_directory.BaseDirectoryServiceTest,
+    unittest.TestCase,
 ):
     serviceClass = DirectoryService
     directoryRecordClass = DirectoryRecord
 
 
+    @inlineCallbacks
+    def test_connect_defaults(self):
+        """
+        Connect with default arguments.
+        """
+        service = self.service()
+        connection = yield service._connect()
 
+        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
+            )
+
+
+
 mockDirectoryData = dict(
 )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/670adfd2/attachment.html>