Update TestSuit

Author: sshwsfc

tests/runtests.py

@@ -4,6 +4,9 @@
 import sys
 import tempfile
 
+import django
+
+
 TEST_ROOT = os.path.realpath(os.path.dirname(__file__))
 RUNTESTS_DIR = os.path.join(TEST_ROOT, 'xtests')
 
@@ -72,6 +75,8 @@ def setup(verbosity, test_labels):
     # Load all the ALWAYS_INSTALLED_APPS.
     # (This import statement is intentionally delayed until after we
     # access settings because of the USE_I18N dependency.)
+
+    django.setup()
     from django.db.models.loading import get_apps, load_app
     get_apps()
 
@@ -80,7 +85,7 @@ def setup(verbosity, test_labels):
     test_modules = get_test_modules()
 
     for module_name in test_modules:
-        module_label = '.'.join(['xtests', module_name])
+        module_label = module_name
         # if the module was named on the command line, or
         # no modules were named (i.e., run all), import
         # this module and add it to the list to test.

tests/settings.py

@@ -4,7 +4,7 @@
         'ENGINE': 'django.db.backends.sqlite3',
     }
 }
-
+MIDDLEWARE_CLASSES = ()
 # Required for Django 1.4+
 STATIC_URL = '/static/'
 

tests/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import patterns, include
 
 urlpatterns = patterns('',
-    (r'^view_base/', include('xtests.view_base.urls')),
+    (r'^view_base/', include('view_base.urls')),
 )

tests/xtests/__init__.py

@@ -1,6 +1,6 @@
 from django.http import HttpResponse
 
-from xtests.base import BaseTest
+from base import BaseTest
 from xadmin.sites import AdminSite
 from xadmin.views import BaseAdminView, BaseAdminPlugin, ModelAdminView, filter_hook
 

tests/xtests/site/tests.py

@@ -1,7 +1,7 @@
 
 from django.contrib.auth.models import User
 
-from xtests.base import BaseTest
+from base import BaseTest
 from xadmin.views import BaseAdminView, BaseAdminPlugin, ModelAdminView, ListAdminView
 
 from models import ModelA, ModelB