From 76a90cdf043343237fd86feb769737d1d76e7632 Mon Sep 17 00:00:00 2001 From: medmunds Date: Sun, 20 Apr 2014 13:56:20 -0700 Subject: [PATCH] Use django.test.runner.DiscoverRunner on Django 1.6+ --- runtests.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/runtests.py b/runtests.py index d35ae7c..f38a567 100644 --- a/runtests.py +++ b/runtests.py @@ -5,7 +5,7 @@ import sys from django.conf import settings -APP='djrill' +APP = 'djrill' settings.configure( DEBUG=True, @@ -24,11 +24,16 @@ settings.configure( ) ) -from django.test.simple import DjangoTestSuiteRunner + +try: + from django.test.runner import DiscoverRunner as TestRunner # Django 1.6+ +except ImportError: + from django.test.simple import DjangoTestSuiteRunner as TestRunner # Django -1.5 + def runtests(): - test_runner = DjangoTestSuiteRunner(verbosity=1) - failures = test_runner.run_tests([APP, ]) + test_runner = TestRunner(verbosity=1) + failures = test_runner.run_tests([APP]) sys.exit(failures) if __name__ == '__main__':