From cf4359b5af6939a7dade3e94bee689e6afe7c1d8 Mon Sep 17 00:00:00 2001
From: Bojan Mihelac <bmihelac@mihelac.org>
Date: Fri, 29 Nov 2013 10:40:34 +0100
Subject: [PATCH] Update tests to use Django 1.6 test runner

See https://docs.djangoproject.com/en/1.6/releases/1.6/#new-test-runner
Also set DATABASE["TEST_NAME"]
---
 tests/core/tests/__init__.py | 7 +------
 tests/core/tests/test.py     | 6 ++++++
 tests/settings.py            | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 tests/core/tests/test.py

diff --git a/tests/core/tests/__init__.py b/tests/core/tests/__init__.py
index d81392674..9707fac47 100644
--- a/tests/core/tests/__init__.py
+++ b/tests/core/tests/__init__.py
@@ -1,6 +1 @@
-from fields_tests import *
-from widgets_tests import *
-from resources_tests import *
-from instance_loaders_tests import *
-from admin_integration_tests import *
-from base_formats_tests import *
+from .test import *
diff --git a/tests/core/tests/test.py b/tests/core/tests/test.py
new file mode 100644
index 000000000..d81392674
--- /dev/null
+++ b/tests/core/tests/test.py
@@ -0,0 +1,6 @@
+from fields_tests import *
+from widgets_tests import *
+from resources_tests import *
+from instance_loaders_tests import *
+from admin_integration_tests import *
+from base_formats_tests import *
diff --git a/tests/settings.py b/tests/settings.py
index 15caf2230..8759fdb07 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -27,7 +27,7 @@
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.mysql',
-            'NAME': 'import_export_test',
+            'TEST_NAME': 'import_export_test',
             'USER': os.environ.get('IMPORT_EXPORT_MYSQL_USER', 'root'),
             'OPTIONS': {
                'init_command': 'SET storage_engine=INNODB',