test: skip ldapsync if it is not available

This commit is contained in:
Jérôme Lebleu
2020-01-07 09:34:39 +01:00
committed by Antoine Nguyen
parent c0aedd04d5
commit db12a4aeef
2 changed files with 10 additions and 4 deletions
+3 -3
View File
@@ -4,8 +4,6 @@ from __future__ import unicode_literals
from unittest import skipIf
import ldap
from django.utils import six
from django.utils.encoding import force_bytes, force_str
@@ -13,7 +11,9 @@ from modoboa.core import factories as core_factories
from modoboa.lib.tests import NO_LDAP, ModoTestCase
from modoboa.parameters import tools as param_tools
from . import lib
if not NO_LDAP:
import ldap
from . import lib
@skipIf(NO_LDAP, "No ldap module installed")
+7 -1
View File
@@ -70,10 +70,16 @@ MODOBOA_APPS = (
"modoboa.limits",
"modoboa.parameters",
"modoboa.dnstools",
"modoboa.ldapsync",
# Modoboa extensions here.
)
try:
import ldap # noqa: F401
except ImportError:
pass
else:
MODOBOA_APPS += ("modoboa.ldapsync",)
INSTALLED_APPS += MODOBOA_APPS
AUTH_USER_MODEL = "core.User"