Merge branch 'test/views__' into test/views

This commit is contained in:
Aurélien Delobelle 2017-10-11 23:35:38 +02:00
commit c59bc487c3
2 changed files with 5 additions and 2 deletions

View file

@ -33,9 +33,9 @@ before_script:
- sed -i.bak -E 's;^REDIS_PASSWD = .*$;REDIS_PASSWD = "";' cof/settings/secret.py - sed -i.bak -E 's;^REDIS_PASSWD = .*$;REDIS_PASSWD = "";' cof/settings/secret.py
# Remove the old test database if it has not been done yet # Remove the old test database if it has not been done yet
- psql --username=$POSTGRES_USER --host=$DBHOST -c "DROP DATABASE IF EXISTS test_$POSTGRES_DB" - psql --username=$POSTGRES_USER --host=$DBHOST -c "DROP DATABASE IF EXISTS test_$POSTGRES_DB"
- pip install --cache-dir vendor/pip -t vendor/python -r requirements.txt - pip install --upgrade --cache-dir vendor/pip -t vendor/python -r requirements.txt
test: test:
stage: test stage: test
script: script:
- python manage.py test -v3 - python manage.py test

View file

@ -26,5 +26,8 @@ python-dateutil
wagtail==1.10.* wagtail==1.10.*
wagtailmenus==2.2.* wagtailmenus==2.2.*
# Remove this when we switch to Django 1.11
djangorestframework==3.6.4
# Production tools # Production tools
wheel wheel