Switch test runner to py.test

mtruyens · Aug 2, 2014 · 81d5e38 · 81d5e38
1 parent d6327b3
commit 81d5e38
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ media/htmlzip
 media/man
 media/pdf
 media/static
+readthedocs/rtd_tests/builds
 readthedocs/rtd_tests/tests/builds
 user_builds
 user_uploads

diff --git a/pip_requirements.txt b/pip_requirements.txt
@@ -21,7 +21,7 @@ django-guardian==1.2.0
 django-extensions==1.3.8
 South==0.8.4
 djangorestframework==2.3.14 
-django-nose==1.2
+django-pytest==2.6.2
 
 requests==2.3.0
 slumber==0.6.0

diff --git a/runtests.sh b/runtests.sh
@@ -1,5 +1,7 @@
 cd readthedocs
-DJANGO_SETTINGS_MODULE=settings.test ./manage.py test --logging-clear-handlers ./
+export PYTHONPATH=`pwd`:$PYTHONPATH
+export DJANGO_SETTINGS_MODULE=settings.test
+py.test
 exit=$?
 cd -
 exit $exit