Ticket #6298: 6298.diff

tests/runtests.py

@@ -3 +3 @@
 import os, sys, traceback
 import unittest
 
-import django.contrib as contrib
+# tests should use the same version (as has been checked out)
+if sys.argv:
+    script_path = os.path.dirname(sys.argv[0])
+    django_path = os.path.abspath(os.path.join(script_path, ".."))
+    sys.path.insert(1, django_path)
 
-try:
-    set
-except NameError:
-    from sets import Set as set     # For Python 2.3
+import django
+import django.contrib as contrib
 
+print "\nRunning tests against " + os.path.dirname(django.__file__)
 
 CONTRIB_DIR_NAME = 'django.contrib'
 MODEL_TESTS_DIR_NAME = 'modeltests'
@@ -190 +193 @@
     if options.settings:
         os.environ['DJANGO_SETTINGS_MODULE'] = options.settings
     elif "DJANGO_SETTINGS_MODULE" not in os.environ:
-        parser.error("DJANGO_SETTINGS_MODULE is not set in the environment. "
-                      "Set it or use --settings.")
+        # since no settings have been defined, set up a test env using SQLite
+        try:
+            import sqlite3
+            from django.conf import settings
+            settings.configure(**{
+                'DATABASES': {
+                    'default': {
+                        'ENGINE': 'django.db.backends.sqlite3'
+                    },
+                    'other': {
+                        'ENGINE': 'django.db.backends.sqlite3',
+                        'TEST_NAME': 'other_db'
+                    }
+                },
+                'ROOT_URLCONF': '/',
+            })
+        except ImportError:
+            parser.error("DJANGO_SETTINGS_MODULE is not set in the environment. "
+                          "Set it or use --settings.")
     django_tests(int(options.verbosity), options.interactive, options.failfast, args)