Switched to py.test. Run tests for django 1.9 separately.

alexey-sveshnikov · alexey-sveshnikov · commit 29fdcf1c621f · 2016-08-22T23:54:17.000+03:00
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+DJANGO_SETTINGS_MODULE=test_app.settings
diff --git a/test_app/settings.py b/test_app/settings.py
@@ -3,10 +3,8 @@
 
 INSTALLED_APPS = (
     'mailqueue',
-    'django_nose',
 )
 
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 DATABASES = {
     'default': {
diff --git a/tox.ini b/tox.ini
@@ -1,13 +1,14 @@
 [tox]
-envlist = py27-django-{latest,18}
+envlist = py27-django-{latest,18,19}
 
 [testenv]
 deps =
     django-latest: django
     django-18: django>=1.8, <1.9
-    django-nose
+    django-19: django>=1.9, <1.10
+    pytest-django
 setenv = 
     DJANGO_SETTINGS_MODULE=test_app.settings
     PYTHONPATH={toxinidir}
 commands = 
-    django-admin.py test mailqueue
+    py.test

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[pytest]`
	`2`	`+DJANGO_SETTINGS_MODULE=test_app.settings`
Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,8 @@`
`3`	`3`
`4`	`4`	`INSTALLED_APPS = (`
`5`	`5`	`'mailqueue',`
`6`		`- 'django_nose',`
`7`	`6`	`)`
`8`	`7`
`9`		`-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'`
`10`	`8`
`11`	`9`	`DATABASES = {`
`12`	`10`	`'default': {`