From 62e7e5c33375c0f7a7224a07300838acd4a97fc1 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Wed, 2 Dec 2015 13:44:53 -0500 Subject: [PATCH 1/2] Update Django testing to use the currently supported versions. --- tox.ini | 7 +++---- xmlrunner/extra/djangotestrunner.py | 14 ++------------ 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/tox.ini b/tox.ini index bd41866..e8d237b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,11 @@ [tox] -envlist = begin,py{26,27,33,34},py27-django{lts,prev,curr},end,quality +envlist = begin,py{26,27,33,34},py27-django{lts,curr},end,quality [testenv] deps = coverage - djangolts: django==1.4.22 - djangoprev: django==1.6.11 - djangocurr: django==1.7.10 + djangolts: django==1.8.7 + djangocurr: django==1.9 commands = coverage run --append setup.py test coverage report --omit='.tox/*' diff --git a/xmlrunner/extra/djangotestrunner.py b/xmlrunner/extra/djangotestrunner.py index 018ce14..a4c6905 100644 --- a/xmlrunner/extra/djangotestrunner.py +++ b/xmlrunner/extra/djangotestrunner.py @@ -10,21 +10,11 @@ """ import xmlrunner -import django from django.conf import settings +from django.test.runner import DiscoverRunner -# future compatibilty with django -# in django 1.6 DiscoverRunner bacame default and -# DjangoTestSuiteRunner became depecated, will be removed in 1.8 -if django.VERSION < (1, 6): - from django.test.simple import DjangoTestSuiteRunner - _DjangoRunner = DjangoTestSuiteRunner -else: - from django.test.runner import DiscoverRunner - _DjangoRunner = DiscoverRunner - -class XMLTestRunner(_DjangoRunner): +class XMLTestRunner(DiscoverRunner): def run_suite(self, suite, **kwargs): dummy = kwargs # unused From d5ecc2449edfad5bb2b9712a21e3d55975dd588f Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Wed, 2 Dec 2015 13:48:36 -0500 Subject: [PATCH 2/2] Clean up tests/django_test.py. --- tests/django_test.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/django_test.py b/tests/django_test.py index 10c7549..49b35cf 100644 --- a/tests/django_test.py +++ b/tests/django_test.py @@ -1,4 +1,3 @@ - from xmlrunner.unittest import unittest import sys @@ -9,9 +8,12 @@ import django except ImportError: django = None +else: + from django.test.utils import get_runner TESTS_DIR = path.dirname(__file__) +@unittest.skipIf(django is None, 'django not found') class DjangoTest(unittest.TestCase): def setUp(self): self._old_cwd = getcwd() @@ -20,11 +22,9 @@ def setUp(self): sys.path.append(self.project_dir) import django.conf django.conf.settings = django.conf.LazySettings() - # os.environ['DJANGO_SETTINGS_MODULE'] = 'django_example.settings' def tearDown(self): chdir(self._old_cwd) - # del os.environ['DJANGO_SETTINGS_MODULE'] def _check_runner(self, runner): suite = runner.build_suite(test_labels=['app2','app']) @@ -40,22 +40,18 @@ def _check_runner(self, runner): 'app2.tests.DummyTestCase.test_pass', ])) - @unittest.skipIf(django is None, 'django not found') def test_django_runner(self): from django.conf import settings settings.configure(INSTALLED_APPS=['app','app2']) - from django.test.utils import get_runner runner_class = get_runner(settings) runner = runner_class() self._check_runner(runner) - @unittest.skipIf(django is None, 'django not found') def test_django_xmlrunner(self): from django.conf import settings settings.configure( INSTALLED_APPS=['app','app2'], TEST_RUNNER='xmlrunner.extra.djangotestrunner.XMLTestRunner') - from django.test.utils import get_runner runner_class = get_runner(settings) runner = runner_class() self._check_runner(runner)