From 5cfb8bf5a30a2fc25fa984d20df5eb3216b45a66 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 11 Feb 2015 15:10:54 +0100 Subject: [PATCH] Don't check extensions --- modoboa/core/commands/templates/settings.py.tpl | 10 ---------- tests/install_from_scratch.py | 8 +------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl index c19db186e..c4ef22677 100644 --- a/modoboa/core/commands/templates/settings.py.tpl +++ b/modoboa/core/commands/templates/settings.py.tpl @@ -57,14 +57,6 @@ MODOBOA_APPS = ( 'modoboa.core', 'modoboa.lib', # Modoboa extensions here. - 'modoboa.extensions.postfix_relay_domains', - 'modoboa.extensions.limits', - 'modoboa.extensions.postfix_autoreply', - 'modoboa.extensions.webmail', - 'modoboa.extensions.stats', - 'modoboa.extensions.sievefilters', - 'modoboa.extensions.radicale', - {% if not amavis_conn %}#{% endif %}'modoboa.extensions.amavis', # Tools from here #'modoboa.tools.pfxadmin_migrate', @@ -120,8 +112,6 @@ DATABASES = { {{ default_conn|safe }} {{ amavis_conn|safe }}{% endif %} } -DATABASE_ROUTERS = ["modoboa.extensions.amavis.dbrouter.AmavisRouter"] - # Internationalization # https://docs.djangoproject.com/en/1.6/topics/i18n/ diff --git a/tests/install_from_scratch.py b/tests/install_from_scratch.py index fa2663afe..265ece7c2 100644 --- a/tests/install_from_scratch.py +++ b/tests/install_from_scratch.py @@ -21,14 +21,8 @@ class DeployTest(unittest.TestCase): def tearDown(self): path = os.path.join(self.workdir, self.projname) core_apps = ["modoboa.core", "modoboa.lib"] - extensions = [ - "admin", "limits", "postfix_relay_domains", "radicale", - "postfix_autoreply" - ] - cmd = "python manage.py test {0} {1}".format( + cmd = "python manage.py test {0}".format( " ".join(core_apps), - " ".join(["modoboa.extensions.{0}".format(extension) - for extension in extensions]) ) code, output = exec_cmd(cmd, capture_output=False, cwd=path) self.assertEqual(code, 0)