Switch to py.test

Author: dominicrodger

Diff for: pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+DJANGO_SETTINGS_MODULE = tests.settings
+addopts = --tb=short

Diff for: setup.py

@@ -1,7 +1,22 @@
+import sys
 from setuptools import setup, find_packages
+from setuptools.command.test import test as TestCommand
 
 import tinycontent
 
+
+class PyTest(TestCommand):
+    def finalize_options(self):
+        TestCommand.finalize_options(self)
+        self.test_args = []
+        self.test_suite = True
+
+    def run_tests(self):
+        import pytest
+        errno = pytest.main(self.test_args)
+        sys.exit(errno)
+
+
 setup(
     name='django-tinycontent',
     version=tinycontent.__version__,
@@ -28,7 +43,9 @@
         "Programming Language :: Python :: 3.3",
     ],
     tests_require=(
-        'django-setuptest==0.1.6',
+        "pytest==2.6.4",
+        "pytest-cov==1.7.0",
+        "pytest-django==2.8.0",
     ),
-    test_suite='setuptest.setuptest.SetupTestSuite',
+    cmdclass = {'test': PyTest},
 )

Diff for: tests/__init__.py

@@ -11,4 +11,5 @@
     'tinycontent',
 )
 
-ROOT_URLCONF = 'test_urls'
+ROOT_URLCONF = 'tests.urls'
+SECRET_KEY = 'thisbagismadefromrecycledmaterial'

Diff for: test_settings.py renamed to tests/settings.py

@@ -1,3 +1,9 @@
+import os
+import sys
+
+# Needed for the custom filter tests
+sys.path.append(os.path.dirname(__file__))
+
 from django.contrib.auth.models import User, Permission
 from django.contrib.auth.context_processors import PermWrapper
 from django.core.exceptions import ImproperlyConfigured
@@ -220,31 +226,31 @@ def test_with_html_complex(self):
                                          "Not found."
                                          "{% endtinycontent %}"))
 
-    @override_settings(TINYCONTENT_FILTER='tinycontent.tests.toupper')
+    @override_settings(TINYCONTENT_FILTER='test_tinycontent.toupper')
     def test_with_custom_filter_simple(self):
         self.assertEqual("THIS IS A TEST.",
                          render_template("{% tinycontent_simple 'foobar' %}"))
 
-    @override_settings(TINYCONTENT_FILTER='tinycontent.tests.toupper')
+    @override_settings(TINYCONTENT_FILTER='test_tinycontent.toupper')
     def test_with_custom_filter_complex(self):
         self.assertEqual("THIS IS A TEST.",
                          render_template("{% tinycontent 'foobar' %}"
                                          "Not found."
                                          "{% endtinycontent %}"))
 
-    @override_settings(TINYCONTENT_FILTER='tinycontent.tests.toupper')
+    @override_settings(TINYCONTENT_FILTER='test_tinycontent.toupper')
     def test_with_custom_filter_simple_with_html(self):
         self.assertEqual("<STRONG>&AMP;</STRONG>",
                          render_template("{% tinycontent_simple 'html' %}"))
 
-    @override_settings(TINYCONTENT_FILTER='tinycontent.tests.toupper')
+    @override_settings(TINYCONTENT_FILTER='test_tinycontent.toupper')
     def test_with_custom_filter_complex_with_html(self):
         self.assertEqual("<STRONG>&AMP;</STRONG>",
                          render_template("{% tinycontent 'html' %}"
                                          "Not found."
                                          "{% endtinycontent %}"))
 
-    @override_settings(TINYCONTENT_FILTER='tinycontent.tests.ohnothisisfake')
+    @override_settings(TINYCONTENT_FILTER='test_tinycontent.ohnothisisfake')
     def test_with_bad_custom_filter(self):
         with self.assertRaises(ImproperlyConfigured):
             render_template("{% tinycontent_simple 'foobar' %}")

Diff for: tinycontent/tests.py renamed to tests/test_tinycontent.py

@@ -3,6 +3,7 @@
 from django.contrib import admin
 admin.autodiscover()
 
-urlpatterns = patterns('',
+urlpatterns = patterns(
+    '',
     url(r'^admin/', include(admin.site.urls)),
 )

Diff for: test_urls.py renamed to tests/urls.py

@@ -25,4 +25,4 @@ commands=
 basepython=python
 deps=flake8
 commands=
-    flake8 tinycontent
+    flake8 tinycontent tests setup.py