Merge pull request #22 from dstegelman/feature/django_18

Django 1.8
psu-oit · Apr 4, 2015 · 793c92d · 793c92d
2 parents b81b634 + eb9b2c0
commit 793c92d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ env:
   - DJANGO_VERSION=Django==1.5
   - DJANGO_VERSION=Django==1.6
   - DJANGO_VERSION=Django==1.7
+  - DJANGO_VERSION=Django==1.8
 
 # command to install dependencies
 install:

diff --git a/runtests.py b/runtests.py
@@ -41,9 +41,13 @@
     django.setup()
 except AttributeError:
     pass
+try:
+    from django.test.simple import DjangoTestSuiteRunner
+    test_runner = DjangoTestSuiteRunner(verbosity=1)
+except ImportError:
+    from django.test.runner import DiscoverRunner
+    test_runner = DiscoverRunner(verbosity=1)
 
-from django.test.simple import DjangoTestSuiteRunner
-test_runner = DjangoTestSuiteRunner(verbosity=1)
 failures = test_runner.run_tests(['downtime', ])
 if failures:
     sys.exit(failures)