Skip to content

Commit

Permalink
Update tests to use Django 1.6 test runner
Browse files Browse the repository at this point in the history
  • Loading branch information
bmihelac committed Nov 29, 2013
1 parent 87bd6cd commit cf4359b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
7 changes: 1 addition & 6 deletions tests/core/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -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 *
6 changes: 6 additions & 0 deletions tests/core/tests/test.py
Original file line number Diff line number Diff line change
@@ -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 *
2 changes: 1 addition & 1 deletion tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit cf4359b

Please sign in to comment.