Skip to content
Snippets Groups Projects
Commit 4f15d3d2 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Fixed #19: now uses pytest as a testing framework

parent e7c8cad6
No related branches found
No related tags found
No related merge requests found
...@@ -9,8 +9,7 @@ test_api: ...@@ -9,8 +9,7 @@ test_api:
- cd api - cd api
- pip install -r requirements/test.txt - pip install -r requirements/test.txt
script: script:
- export DJANGO_SETTINGS_MODULE=config.settings.test - pytest
- python manage.py test
tags: tags:
- docker - docker
......
[pytest]
DJANGO_SETTINGS_MODULE=config.settings.test
# -- recommended but optional:
python_files = tests.py test_*.py *_tests.py
...@@ -5,3 +5,7 @@ ...@@ -5,3 +5,7 @@
flake8==2.5.0 flake8==2.5.0
model-mommy==1.3.2 model-mommy==1.3.2
tox==2.7.0 tox==2.7.0
pytest
pytest-django
pytest-sugar
pytest-xdist
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" 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: test:
dockerfile: docker/Dockerfile.test dockerfile: docker/Dockerfile.test
build: . build: .
command: python manage.py test command: pytest
volumes: volumes:
- .:/app - .:/app
environment:
- DJANGO_SETTINGS_MODULE=config.settings.test
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment