This commit is contained in:
Jens L
2020-09-11 23:21:11 +02:00
committed by GitHub
parent 3f5d30e6fe
commit 23cccebb96
59 changed files with 403 additions and 254 deletions

View File

@ -12,7 +12,6 @@ https://docs.djangoproject.com/en/2.1/ref/settings/
import importlib
import os
import sys
from json import dumps
import structlog
@ -156,6 +155,7 @@ DJANGO_REDIS_IGNORE_EXCEPTIONS = True
DJANGO_REDIS_LOG_IGNORED_EXCEPTIONS = True
SESSION_ENGINE = "django.contrib.sessions.backends.cache"
SESSION_CACHE_ALIAS = "default"
SESSION_COOKIE_SAMESITE = "lax"
MIDDLEWARE = [
"django_prometheus.middleware.PrometheusBeforeMiddleware",
@ -372,15 +372,9 @@ LOGGING = {
}
TEST = False
TEST_RUNNER = "xmlrunner.extra.djangotestrunner.XMLTestRunner"
TEST_RUNNER = "passbook.root.test_runner.PytestTestRunner"
LOG_LEVEL = CONFIG.y("log_level").upper()
TEST_OUTPUT_FILE_NAME = "unittest.xml"
if len(sys.argv) >= 2 and sys.argv[1] == "test":
LOG_LEVEL = "DEBUG"
TEST = True
CELERY_TASK_ALWAYS_EAGER = True
_LOGGING_HANDLER_MAP = {
"": LOG_LEVEL,
@ -431,7 +425,6 @@ for _app in INSTALLED_APPS:
pass
if DEBUG:
SESSION_COOKIE_SAMESITE = None
INSTALLED_APPS.append("debug_toolbar")
MIDDLEWARE.append("debug_toolbar.middleware.DebugToolbarMiddleware")