Adding py.test

xy2 · Feb 27, 2016 · b2695f1 · b2695f1
1 parent 57bf211
commit b2695f1
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.py[cod]
+.cache
 
 # C extensions
 *.so

diff --git a/manage.py b/manage.py
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+DJANGO_SETTINGS_MODULE=tests.settings
+python_paths = .
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/testsettings.py → tests/settings.py b/testsettings.py → tests/settings.py
diff --git a/templated_email/tests.py → tests/test_get_connection.py b/templated_email/tests.py → tests/test_get_connection.py
diff --git a/tox.ini b/tox.ini
@@ -6,10 +6,12 @@ envlist =
 
 [testenv]
 commands=
-    python manage.py test
+    py.test
 deps=
     django18: Django==1.8.9
     django19: Django==1.9.2
+    pytest-django
+    pytest-pythonpath
 
 [testenv:py27-pyflakes]
 commands = pyflakes templated_email