[CalendarServer-changes] [12987] twext/trunk/twext/who/ldap/test/test_service.py
source_changes at macosforge.org
source_changes at macosforge.org
Fri Mar 21 12:47:59 PDT 2014
Revision: 12987
http://trac.calendarserver.org//changeset/12987
Author: wsanchez at apple.com
Date: 2014-03-21 12:47:59 -0700 (Fri, 21 Mar 2014)
Log Message:
-----------
Skip tests if no MockLdap
Modified Paths:
--------------
twext/trunk/twext/who/ldap/test/test_service.py
Modified: twext/trunk/twext/who/ldap/test/test_service.py
===================================================================
--- twext/trunk/twext/who/ldap/test/test_service.py 2014-03-21 18:47:20 UTC (rev 12986)
+++ twext/trunk/twext/who/ldap/test/test_service.py 2014-03-21 19:47:59 UTC (rev 12987)
@@ -23,18 +23,22 @@
from itertools import chain
import ldap
-from mockldap import MockLdap
-from mockldap.filter import (
- Test as MockLDAPFilterTest,
- UnsupportedOp as MockLDAPUnsupportedOp,
-)
+try:
+ from mockldap import MockLdap
+ from mockldap.filter import (
+ Test as MockLDAPFilterTest,
+ UnsupportedOp as MockLDAPUnsupportedOp,
+ )
+except ImportError:
+ MockLdap = None
from twisted.python.constants import NamedConstant, ValueConstant
from twisted.python.filepath import FilePath
from twisted.internet.defer import inlineCallbacks
from twisted.cred.credentials import UsernamePassword
from twisted.trial import unittest
+from twisted.trial.unittest import SkipTest
from ...idirectory import QueryNotSupportedError, FieldName as BaseFieldName
from .._service import (
@@ -78,6 +82,9 @@
def setUp(self):
+ if MockLdap is None:
+ raise SkipTest("No MockLdap available")
+
def matches(self, dn, attrs, upcall=MockLDAPFilterTest.matches):
if upcall(self, dn, attrs):
return True
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140321/b64d72a4/attachment.html>
More information about the calendarserver-changes
mailing list