From 3f9a89a8b233859060a8ce5223b4a92182fa0343 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Thu, 7 Jun 2018 19:48:01 -0700 Subject: [PATCH] Fix test (#249) * SessionAuthenticationMiddlware should be removed now. * Force installation of Django-mailman3 from Git for rolling builds. --- tests/test.sh | 2 +- web/Dockerfile.dev | 2 +- web/mailman-web/settings.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/test.sh b/tests/test.sh index 5ee8b58..8d16e7c 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -27,7 +27,7 @@ docker logs mailman-core # Check to see if the core is working as expected. -docker exec -it mailman-core curl -u restadmin:restpass http://172.19.199.2:8001/3.1/system +docker exec -it mailman-core curl -u restadmin:restpass http://172.19.199.2:8001/3.1/system | grep "GNU Mailman" # Check to see if postorius is working. docker exec -it mailman-web curl -L http://172.19.199.3:8000/postorius/lists | grep "Mailing List" diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 8beec9c..56433b0 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -23,13 +23,13 @@ RUN set -ex \ && pip install -U git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \ git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \ git+https://gitlab.com/mailman/hyperkitty@${HYPERKITTY_REF} \ - git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \ whoosh \ uwsgi \ psycopg2 \ dj-database-url \ mysqlclient \ && pip install -U django>=1.11\ + && pip install -U git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \ && apk del .build-deps \ && addgroup -S mailman \ && adduser -S -G mailman mailman \ diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py index cd31115..d283637 100644 --- a/web/mailman-web/settings.py +++ b/web/mailman-web/settings.py @@ -102,7 +102,6 @@ _MIDDLEWARE = ( 'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.locale.LocaleMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware',