settings: Fix deprecated 'TEST_CHARSET' warning

[patchwork] / patchwork / settings / dev.py

diff --git a/patchwork/settings/dev.py b/patchwork/settings/dev.py
index 6e373cc74a29b55cce86ad16e9ca84d6dde94bf2..e93249c6929e4e962952b1277fef4cd9452808ef 100644 (file)
--- a/patchwork/settings/dev.py
+++ b/patchwork/settings/dev.py
@@ -38,12 +38,15 @@ DATABASES = {
         'USER': os.environ['PW_TEST_DB_USER'],
         'PASSWORD': os.environ['PW_TEST_DB_PASS'],
         'NAME': 'patchwork',
-        'TEST_CHARSET': 'utf8',
     },
 }
 
-if django.VERSION >= (1, 7):
-    TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+if django.VERSION < (1, 7):
+    DATABASES['default']['TEST_CHARSET'] = 'utf8'
+else:
+    DATABASES['default']['TEST'] = {
+        'CHARSET': 'utf8',
+    }
 
 #
 # Patchwork settings