From 4286edfee376e9167d99167a6dc0e51bc3df9a17 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 2 Jun 2015 13:26:04 +0200 Subject: [PATCH] Use py.test for testing --- .travis.yml | 2 +- src/pytest.ini | 3 +++ src/requirements/testing.txt | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 src/pytest.ini diff --git a/.travis.yml b/.travis.yml index fceef13222..120b7fb8bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,6 @@ before_script: script: - make - make compress - - coverage run manage.py test -v 2 + - coverage run py.test after_success: - coveralls diff --git a/src/pytest.ini b/src/pytest.ini new file mode 100644 index 0000000000..6a00918430 --- /dev/null +++ b/src/pytest.ini @@ -0,0 +1,3 @@ +[pytest] +DJANGO_SETTINGS_MODULE=pretix.settings + diff --git a/src/requirements/testing.txt b/src/requirements/testing.txt index 3e426d2bd9..82da817177 100644 --- a/src/requirements/testing.txt +++ b/src/requirements/testing.txt @@ -6,6 +6,8 @@ flake8 coveralls coverage selenium +pytest +pytest-django # PyVirtualDisplay # -e git+https://github.com/pretix/sauceclient.git@master#egg=sauceclient # travis