Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
elnappo committed Mar 7, 2019
1 parent 474bc82 commit fe563aa
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@ test:
variables:
POSTGRES_DB: test
stage: test
image: "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG"
image: ubuntu:rolling
script:
- setup_test_db
- /code/docker-entrypoint.sh test
- ./tools/install_requirements.sh
- pip3 install --requirement requirements.txt
- pytest
artifacts:
reports:
junit: report.xml
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:rolling

ENV PYTHONUNBUFFERED=1
ENV VIRTUAL_ENV /venv
Expand Down
1 change: 1 addition & 0 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ case "$1" in
;;
gunicorn)
echo "Starting Django application via Gunicorn"
# Disable access log?
exec gunicorn -b :8000 --worker-class gevent --worker-connections 20 --timeout 10 --graceful-timeout 30 --access-logfile - wsgi
;;
help)
Expand Down
2 changes: 1 addition & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ DJANGO_SETTINGS_MODULE = settings
# -- recommended but optional:
python_files = tests.py test_*.py *_tests.py
junit_family = xunit2
addopts = --reuse-db --cov-report term --cov=project_novis --junitxml=report.xml
addopts = --verbose --reuse-db --cov-report term --cov=project_novis --junitxml=report.xml

0 comments on commit fe563aa

Please sign in to comment.