attempts to fix tests for django 1.7

jazzband · Apr 8, 2015 · e971ab8 · e971ab8
1 parent 989dc26
commit e971ab8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -0,0 +1,4 @@
+import django
+setup = getattr(django, 'setup', None)
+if setup:
+    setup()
diff --git a/tests/settings.py b/tests/settings.py
@@ -20,16 +20,19 @@
     'django.contrib.messages',
     'django.contrib.sessions',
     'silk',
+    'django_nose',
     'example_app'
 )
 
+TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+
 # A quick hack to get tests to pass for django 1.5
 if django.VERSION < (1, 6):
     INSTALLED_APPS += ("tests", )
     ROOT_URLCONF = 'tests.urls'
 
 else:
-     ROOT_URLCONF = 'urls'
+    ROOT_URLCONF = 'urls'
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -45,11 +48,11 @@
 
 DB_NAME = os.path.join(BASE_DIR, 'db.sqlite3')
 
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': DB_NAME,
+        'TEST_NAME': DB_NAME
     }
 }
 

diff --git a/tests/test-requirements.txt b/tests/test-requirements.txt
@@ -10,3 +10,4 @@ pytz>2014.2
 mock==1.0.1
 Pillow==2.5.1
 nose
+django-nose