Commit f977f3a3 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch 'develop' of ssh://code.eliotberriot.com:2222/funkwhale/funkwhale into develop

parents 80cfd718 2a8fb379
Pipeline #89 passed with stages
in 2 minutes and 9 seconds
......@@ -9,8 +9,7 @@ test_api:
- cd api
- pip install -r requirements/test.txt
script:
- export DJANGO_SETTINGS_MODULE=config.settings.test
- python manage.py test
- pytest
tags:
- docker
......
[pytest]
DJANGO_SETTINGS_MODULE=config.settings.test
# -- recommended but optional:
python_files = tests.py test_*.py *_tests.py
......@@ -5,3 +5,7 @@
flake8==2.5.0
model-mommy==1.3.2
tox==2.7.0
pytest
pytest-django
pytest-sugar
pytest-xdist
......@@ -2,4 +2,4 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
docker-compose -f $DIR/test.yml run test python manage.py test "$@"
docker-compose -f $DIR/test.yml run test pytest "$@"
test:
dockerfile: docker/Dockerfile.test
build: .
command: python manage.py test
command: pytest
volumes:
- .:/app
environment:
- DJANGO_SETTINGS_MODULE=config.settings.test
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment