Run tests with py.test

yprez · Jan 18, 2016 · 0b4e24b · 0b4e24b
1 parent 2c97353
commit 0b4e24b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 *.egg-info
 .coverage
 .tox
+.cache
 
 /MANIFEST
 /dist

diff --git a/tox.ini b/tox.ini
@@ -12,17 +12,19 @@ deps =
     django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
+    coverage: pytest-cov==2.2.0
+    pytest==2.6.3
+    pytest-django==2.9.1
 setenv =
     PYTHONPATH = .
     DJANGO_SETTINGS_MODULE=test_settings
 commands =
-    django-admin.py test logentry_admin
+    py.test logentry_admin/tests.py
 
-[testenv:coverage]
-deps = coverage
+[testenv:coverage-django19]
 commands =
-    coverage run --source=logentry_admin {envbindir}/django-admin.py test logentry_admin
-    coverage report --show-missing --fail-under=90
+    py.test logentry_admin/tests.py --cov=logentry_admin \
+        --cov-report=term-missing --cov-fail-under=90
 
 [testenv:flake8]
 deps = flake8==2.5.1