Merge branch 'master' into django-1.8

* master:
  removed unneccessary lines from quicktest.py and added source
This commit is contained in:
Alex Seeholzer 2015-06-12 15:38:08 +02:00
commit 0311331181

View File

@ -93,6 +93,9 @@ class QuickDjangoTest(object):
STATIC_URL = '/static/'
)
# compatibility with django 1.8 downwards
# see: http://stackoverflow.com/questions/3841725/how-to-launch-tests-for-django-reusable-app
try:
# Django <= 1.8
from django.test.simple import DjangoTestSuiteRunner
@ -109,11 +112,6 @@ class QuickDjangoTest(object):
if failures:
sys.exit(failures)
# from django.test.simple import DjangoTestSuiteRunner
# failures = DjangoTestSuiteRunner().run_tests(self.apps, verbosity=1)
# if failures:
# sys.exit(failures)
if __name__ == '__main__':
"""
What do when the user hits this file from the shell.