From db12a4aeef2bc64757e1db7cc12890eae6e959f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Sun, 29 Dec 2019 18:54:10 +0100 Subject: [PATCH] test: skip ldapsync if it is not available --- modoboa/ldapsync/tests.py | 6 +++--- test_project/test_project/settings.py | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modoboa/ldapsync/tests.py b/modoboa/ldapsync/tests.py index 4d42c983b..448d28ae9 100644 --- a/modoboa/ldapsync/tests.py +++ b/modoboa/ldapsync/tests.py @@ -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") diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py index 7298d4b7b..bfc096869 100644 --- a/test_project/test_project/settings.py +++ b/test_project/test_project/settings.py @@ -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"