Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-15 16:12:51 +11:00
Code Issues Projects Releases Packages Wiki Activity

No need to handle version 1.7 Django anymore so removing those cases from runtests.py (#102)

Browse source
This commit is contained in:
Jason Moujaes 2018-03-03 14:57:51 -05:00 committed by Martin Mahner
parent 48c77e6ad8
commit 27d608e5da
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
runtests.py
View file

@ -1,7 +1,10 @@
#!/usr/bin/env python #!/usr/bin/env python
import sys import sys
import django
from django.conf import settings from django.conf import settings
from django.test.runner import DiscoverRunner as TestRunner
SETTINGS = { SETTINGS = {
'DATABASES': { 'DATABASES': {
@ -51,19 +54,10 @@ def runtests(*test_args):
if not settings.configured: if not settings.configured:
settings.configure(**SETTINGS) settings.configure(**SETTINGS)
# New Django 1.7 app registry setup # app registry setup
try: django.setup()
from django import setup
setup()
except ImportError:
pass
# New Django 1.8 test runner
try:
from django.test.runner import DiscoverRunner as TestRunner
except ImportError:
from django.test.simple import DjangoTestSuiteRunner as TestRunner
# test runner
test_runner = TestRunner(verbosity=1) test_runner = TestRunner(verbosity=1)
failures = test_runner.run_tests(['dpaste']) failures = test_runner.run_tests(['dpaste'])
if failures: if failures: