Tests updated for Django 1.8

ellmetha · Mar 15, 2015 · 44d4e07 · 44d4e07
1 parent df4b284
commit 44d4e07
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/runtests.py b/runtests.py
@@ -14,8 +14,12 @@
 
 
 def run(verbosity, *args):
-    from django_nose import NoseTestSuiteRunner
-    runner = NoseTestSuiteRunner(verbosity=verbosity)
+    if django.VERSION < (1, 8):
+        from django_nose import NoseTestSuiteRunner
+        runner = NoseTestSuiteRunner(verbosity=verbosity)
+    else:
+        from django.test.runner import DiscoverRunner
+        runner = DiscoverRunner(verbosity=verbosity)
 
     if not args:
         args = ['tests']

diff --git a/tests/unit/core/test_fields.py b/tests/unit/core/test_fields.py
@@ -90,6 +90,7 @@ def test_should_use_a_default_text_input_widget_with_formfields(self):
         class TestableForm(forms.ModelForm):
             class Meta:
                 model = TestableModel
+                exclude = []
         # Run
         form = TestableForm()
         # Check
@@ -102,6 +103,7 @@ def test_can_use_a_custom_form_widget(self):
         class TestableForm(forms.ModelForm):
             class Meta:
                 model = TestableModel
+                exclude = []
         # Run
         form = TestableForm()
         # Check
@@ -116,6 +118,7 @@ def test_should_not_allow_non_accessible_custom_form_widgets(self):
             class TestableForm(forms.ModelForm):
                 class Meta:
                     model = TestableModel
+                    exclude = []
         machina_settings.MACHINA_MARKUP_WIDGET = None
 
 

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27-1.4, py27-1.5, py27-1.6, py27-1.7, py33-1.5, py33-1.6, py33-1.7, py34-1.5, py34-1.6, py34-1.7
+envlist = py27-1.4, py27-1.5, py27-1.6, py27-1.7, py27-1.8, py33-1.5, py33-1.6, py33-1.7, py33-1.8, py34-1.5, py34-1.6, py34-1.7, py34-1.8
 
 [flake8]
 ignore = E501
@@ -32,6 +32,14 @@ deps =
 	-r{toxinidir}/requirements.txt
 	django>=1.7,<1.8a
 
+[testenv:py27-1.8]
+basepython =python2.7
+deps =
+	-r{toxinidir}/requirements.txt
+	django>=1.8b2
+	git+git://github.com/django-mptt/django-mptt
+	git+git://github.com/lukaszb/django-guardian
+
 [testenv:py33-1.5]
 basepython = python3.3
 deps =
@@ -50,6 +58,14 @@ deps =
 	-r{toxinidir}/requirements.txt
 	django>=1.7,<1.8a
 
+[testenv:py33-1.8]
+basepython =python3.3
+deps =
+	-r{toxinidir}/requirements.txt
+	django>=1.8b2
+	git+git://github.com/django-mptt/django-mptt
+	git+git://github.com/lukaszb/django-guardian
+
 [testenv:py34-1.5]
 basepython = python3.4
 deps =
@@ -68,6 +84,14 @@ deps =
 	-r{toxinidir}/requirements.txt
 	django>=1.7,<1.8a
 
+[testenv:py34-1.8]
+basepython =python3.4
+deps =
+	-r{toxinidir}/requirements.txt
+	django>=1.8b2
+	git+git://github.com/django-mptt/django-mptt
+	git+git://github.com/lukaszb/django-guardian
+
 [testenv:lint]
 deps =
 	flake8