From 4f785da452000f764ec8fd745a7500caf99b4495 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 10 May 2020 13:06:38 +0200 Subject: [PATCH] root: fix migrations for CI --- passbook/root/settings.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/passbook/root/settings.py b/passbook/root/settings.py index 3186cfc2f..608d1364d 100644 --- a/passbook/root/settings.py +++ b/passbook/root/settings.py @@ -96,12 +96,14 @@ INSTALLED_APPS = [ "passbook.providers.oidc.apps.PassbookProviderOIDCConfig", "passbook.providers.saml.apps.PassbookProviderSAMLConfig", "passbook.providers.samlv2.apps.PassbookProviderSAMLv2Config", + "passbook.stages.dummy.apps.PassbookStageDummyConfig", "passbook.stages.login.apps.PassbookStageLoginConfig", "passbook.stages.identification.apps.PassbookStageIdentificationConfig", "passbook.stages.otp.apps.PassbookStageOTPConfig", "passbook.stages.captcha.apps.PassbookStageCaptchaConfig", "passbook.stages.password.apps.PassbookStagePasswordConfig", "passbook.stages.email.apps.PassbookStageEmailConfig", + "passbook.policies.dummy.apps.PassbookPolicyDummyConfig", "passbook.policies.expiry.apps.PassbookPolicyExpiryConfig", "passbook.policies.reputation.apps.PassbookPolicyReputationConfig", "passbook.policies.hibp.apps.PassbookPolicyHIBPConfig", @@ -353,7 +355,7 @@ TEST_RUNNER = "xmlrunner.extra.djangotestrunner.XMLTestRunner" TEST_OUTPUT_FILE_NAME = "unittest.xml" if any("test" in arg for arg in sys.argv): - LOGGING["loggers"]["django"]["level"] = "DEBUG" + LOGGING = None TEST = True CELERY_TASK_ALWAYS_EAGER = True @@ -389,10 +391,4 @@ if DEBUG: INSTALLED_APPS.append("debug_toolbar") MIDDLEWARE.append("debug_toolbar.middleware.DebugToolbarMiddleware") - # Load Dummy/Debug objects - INSTALLED_APPS += [ - "passbook.stages.dummy.apps.PassbookStageDummyConfig", - "passbook.policies.dummy.apps.PassbookPolicyDummyConfig", - ] - INSTALLED_APPS.append("passbook.core.apps.PassbookCoreConfig")