Scott.Idem/OSIT-Mailman3
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix test (#249)

Browse Source 
* SessionAuthenticationMiddlware should be removed now.

* Force installation of Django-mailman3 from Git for rolling builds.
This commit is contained in:
Abhilash Raj
2018-06-07 19:48:01 -07:00
committed by GitHub
parent 84835e097d
commit 3f9a89a8b2
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test.sh
View File

@@ -27,7 +27,7 @@ docker logs mailman-core
# Check to see if the core is working as expected. # 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. # 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" docker exec -it mailman-web curl -L http://172.19.199.3:8000/postorius/lists | grep "Mailing List"

2
web/Dockerfile.dev
View File

@@ -23,13 +23,13 @@ RUN set -ex \
&& pip install -U git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \ && pip install -U git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \
git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \ git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \
git+https://gitlab.com/mailman/hyperkitty@${HYPERKITTY_REF} \ git+https://gitlab.com/mailman/hyperkitty@${HYPERKITTY_REF} \
git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \
whoosh \ whoosh \
uwsgi \ uwsgi \
psycopg2 \ psycopg2 \
dj-database-url \ dj-database-url \
mysqlclient \ mysqlclient \
&& pip install -U django>=1.11\ && pip install -U django>=1.11\
&& pip install -U git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \
&& apk del .build-deps \ && apk del .build-deps \
&& addgroup -S mailman \ && addgroup -S mailman \
&& adduser -S -G mailman mailman \ && adduser -S -G mailman mailman \

1
web/mailman-web/settings.py
View File

@@ -102,7 +102,6 @@ _MIDDLEWARE = (
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
'django.middleware.locale.LocaleMiddleware', 'django.middleware.locale.LocaleMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',