Skip to content

Commit 01ad955

Browse files
Import DiscoverRunner if available, Django 1.8+
1 parent b6eeb89 commit 01ad955

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

djcelery/contrib/test_runner.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
from __future__ import absolute_import, unicode_literals
22

33
from django.conf import settings
4-
from django.test.simple import DjangoTestSuiteRunner
4+
try:
5+
from django.test.runner import DiscoverRunner
6+
except ImportError:
7+
from django.test.simple import DjangoTestSuiteRunner as DiscoverRunner
58

69
from celery import current_app
710
from celery.task import Task
@@ -20,7 +23,7 @@ def _set_eager():
2023
current_app.conf.CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
2124

2225

23-
class CeleryTestSuiteRunner(DjangoTestSuiteRunner):
26+
class CeleryTestSuiteRunner(DiscoverRunner):
2427
"""Django test runner allowing testing of celery delayed tasks.
2528
2629
All tasks are run locally, not in a worker.
@@ -35,7 +38,7 @@ def setup_test_environment(self, **kwargs):
3538
super(CeleryTestSuiteRunner, self).setup_test_environment(**kwargs)
3639

3740

38-
class CeleryTestSuiteRunnerStoringResult(DjangoTestSuiteRunner):
41+
class CeleryTestSuiteRunnerStoringResult(DiscoverRunner):
3942
"""Django test runner allowing testing of celery delayed tasks,
4043
and storing the results of those tasks in ``TaskMeta``.
4144

0 commit comments

Comments
 (0)